summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2012-09-101-1/+1
|\
| * Merge branch 'maint'Johnathan Corgan2012-09-101-1/+1
| |\
| | * volk: forgot critical variable subsJosh Blum2012-09-101-1/+1
* | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-09-098-10/+55
|\ \ \
| * | | core: dont export totally inline classesJosh Blum2012-09-072-2/+2
| * | | qtgui: fix log10 ambiguous overload in DisplayPlotJosh Blum2012-09-071-2/+2
| * | | wavelet: fix API export declarationsJosh Blum2012-09-073-3/+3
| * | | cmake: copy stdbool for gnuradio as wellJosh Blum2012-09-072-3/+48
* | | | digital: Fixes LMS and CMA equalizers.Tom Rondeau2012-09-0910-48/+181
* | | | filter: moving filter design tool from gr-utils to gr-filter.Tom Rondeau2012-09-094-1/+31
|/ / /
* | | Examples: Fixed minor bugs in examples and blks2impl from namespace changes.Ben Reynwar2012-09-0410-23/+22
* | | Merge branch 'master' into nextJohnathan Corgan2012-09-040-0/+0
|\| |
| * | build: update revision to 3.6.3git3.6.3gitJohnathan Corgan2012-09-041-2/+2
| |/
| * build: update revision to 3.6.2v3.6.2Johnathan Corgan2012-09-041-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2012-09-041-5/+6
|\|
| * Merge branch 'maint'Johnathan Corgan2012-09-041-5/+6
| |\
| | * core: only check for *.conf in prefs dirmaint-3.6.1Martin Braun2012-09-041-5/+6
* | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-09-04141-4097/+4376
|\ \ \
| * | | volk: ensure LV_HAVE_GENERIC always definedJosh Blum2012-09-011-0/+1
| * | | volk: remove the generation of _g variantJosh Blum2012-08-312-18/+0
| * | | volk: convert kernels one last time, removed old kernelsJosh Blum2012-08-30116-13286/+167
| * | | volk: commit the super squash (volk dir only changes)Josh Blum2012-08-30109-540/+13955
* | | | Merge branch 'master' into nextTom Rondeau2012-09-033-159/+166
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'maint'Tom Rondeau2012-09-033-159/+166
| |\|
| | * docs: reworking doc into one extra dox file for easier linking.Tom Rondeau2012-09-033-159/+166
* | | Merge branch 'master' into nextTom Rondeau2012-08-3012-9/+475
|\| |
| * | adding gr_endian_swap blockTim O'Shea2012-08-3010-0/+466
| * | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2012-08-301-1/+3
| |\ \
| * | | filter: fixes naligned value when volk alignment is 1.Tom Rondeau2012-08-302-9/+9
* | | | Merge remote branch 'jblum/volk_next_use_num_points' into nextJohnathan Corgan2012-08-3014-38/+80
|\ \ \ \
| * | | | filter: fix use of volk_32fc_x2_dot_prod_32fc_a for num pointsJosh Blum2012-08-302-3/+3
| * | | | volk: replace num_bytes with num_points in many kernelsJosh Blum2012-08-3012-35/+77
* | | | | Merge branch 'master' into nextJohnathan Corgan2012-08-301-1/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'maint'Johnathan Corgan2012-08-301-1/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * volk: dont set CMAKE_REQUIRED_FLAGS when emptyJosh Blum2012-08-301-1/+3
* | | Merge remote branch 'reynwar/comments_next' into nextJohnathan Corgan2012-08-28136-1277/+2027
|\ \ \
| * | | docs: Modified argument formating in python docstrings in grc.Ben Reynwar2012-08-1438-322/+816
| * | | docs: Changed arguments in python docstrings to new formatting style.Ben Reynwar2012-08-1466-642/+855
| * | | docs: Formatted python docstrings for sphinx docs.Ben Reynwar2012-08-1312-273/+287
| * | | docs: Updating sphinx docs for changes to new block style.Ben Reynwar2012-08-103-8/+7
| * | | docs: Updating sphinx docs for movement of blocks from gr to digital.Ben Reynwar2012-08-108-37/+37
| * | | Merged comments branch into comments_next branch.Ben Reynwar2012-08-1012-11/+41
| |\ \ \
| | * \ \ Merge branch 'master' into commentsBen Reynwar2012-08-08447-2744/+36079
| | |\ \ \
| | * \ \ \ Merge branch 'sphinxdocs' into commentsBen Reynwar2012-05-2232-408/+531
| | |\ \ \ \
| | | * | | | wavelet: Move squash_ff comments so that doxyxml captures them.Ben Reynwar2012-05-221-5/+6
| | * | | | | docs: Adding/editing top-level docstrings.Ben Reynwar2012-05-2112-11/+41
| * | | | | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextBen Reynwar2012-08-10199-5385/+15570
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextBen Reynwar2012-06-25420-5170/+25925
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sphinxdocs' into nextBen Reynwar2012-05-2180-105/+4280
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2012-08-281-0/+13
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |