summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextTom Rondeau2013-01-1513-1376/+1340
|\
| * Merge remote-tracking branch 'mbant/equal_for_tags'Tom Rondeau2013-01-157-2/+92
| |\
| | * core: added remove_tag_item()Martin Braun2013-01-156-2/+87
| | * core: added operator == for tagsMartin Braun2013-01-151-0/+5
| * | Merge remote-tracking branch 'mbant/fix485'Tom Rondeau2013-01-152-1/+13
| |\ \
| | * | grc: Fixed Bug #485 by gracefully exiting when user sets GR_DONT_LOAD_PREFS=1...Martin Braun2013-01-152-1/+13
| | |/
| * | Merge remote-tracking branch 'mbant/demod_examples'Tom Rondeau2013-01-154-913/+783
| |\ \
| | * | digital: made the demod examples clearerMartin Braun2013-01-154-913/+783
| | |/
* | | Merge branch 'master' into nextJohnathan Corgan2013-01-151-34/+32
|\| |
| * | wxgui: implement persistence without using glAccumSylvain Munaut2013-01-151-16/+19
| * | Merge branch 'maint'Johnathan Corgan2013-01-151-36/+31
| |\ \
| | * | wxgui: dead code removal and formatting cleanupSylvain Munaut2013-01-151-36/+31
* | | | Merge branch 'master' into nextJohnathan Corgan2013-01-143-8/+2
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2013-01-143-7/+2
| |\| |
| | * | core: removed redundant test settingsJosh Blum2013-01-141-7/+0
| | * | block: file_source_impl missing mutex includeJosh Blum2013-01-141-0/+1
| | * | core: gr_socket_pdu missing iostreamJosh Blum2013-01-141-0/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2013-01-145-0/+213
|\| | |
| * | | core: adding gr_random_pdu message passing blockTim O'Shea2013-01-145-0/+213
* | | | pager: converting to new API structure.Tom Rondeau2013-01-1343-1381/+1653
* | | | noaa: converting to new API structure.Tom Rondeau2013-01-1326-710/+857
* | | | comedi: converting to new API structure.Tom Rondeau2013-01-1321-865/+1005
* | | | pmt: fixing a few files with older pmt naming style.Tom Rondeau2013-01-1310-141/+138
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-01-137-3/+167
|\ \ \ \
| * | | | Merge branch 'master' into nextJohnathan Corgan2013-01-117-3/+167
| |\| | |
| | * | | Merge branch 'atsc'Johnathan Corgan2013-01-117-3/+167
| | |\ \ \
| | | * | | atsc: commented out debug codeJohnathan Corgan2013-01-111-1/+1
| | | * | | atsc: Make equililzer taps accessible in python.Ben Reynwar2012-12-194-0/+14
| | | * | | atsc: Fixed bug I made in last commit.Ben Reynwar2012-12-191-0/+2
| | | * | | atsc: Minor changes to atsc.Ben Reynwar2012-12-193-3/+151
| * | | | | Merge branch 'master' into nextJohnathan Corgan2013-01-080-0/+0
| |\| | | |
| | * | | | cmake: updated revision to 3.6.4git post-releasev3.6.4gitJohnathan Corgan2013-01-081-2/+2
| | | |/ / | | |/| |
| | * | | cmake: update revision to 3.6.3 for releasev3.6.3Johnathan Corgan2013-01-081-1/+1
* | | | | vocoder: updating QA test for vocoders.Tom Rondeau2013-01-078-25/+104
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-01-0786-849/+1015
|\| | | |
| * | | | merge of fix_build_dir_order, fix conflictMichael L Dickens2013-01-071-4/+0
| |\| | |
| | * | | remove unnecessary build commandsMichael L Dickens2013-01-041-4/+0
| * | | | Merge branch 'next' into fix_build_dir_order_nextMichael L Dickens2013-01-0730-690/+615
| |\ \ \ \
| | * | | | qtgui: fixing up rest of name changes in UI file (examples were tested this t...Tom Rondeau2013-01-033-19/+19
| | * | | | qtgui: missed these updated slot names.Tom Rondeau2013-01-031-5/+5
| | * | | | qtgui: function names updated so they are (or should be) consistent.Tom Rondeau2013-01-0323-500/+503
| | * | | | qtgui: fixed waterfall plots to handle center frequency changes.Tom Rondeau2013-01-037-99/+59
| | * | | | squash meTom Rondeau2013-01-031-1/+1
| | * | | | qtgui: fix for frequency plot to handle change in center frequency.Tom Rondeau2013-01-037-73/+35
| * | | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ...Michael L Dickens2013-01-0456-158/+403
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Reorder SWIG_INCLUDE_DIRSMichael L Dickens2013-01-032-3/+7
| | * | | FFT_INCLUDE_DIRS -> GR_FFT_INCLUDE_DIRS, and reorderMichael L Dickens2013-01-031-1/+1
| | * | | GrUseQt4 -> GrSetupQt4, since that's what it really does.Michael L Dickens2013-01-032-1/+1
| | * | | Merge branch 'master' of http://gnuradio.org/git/gnuradio into fix_build_dir_...Michael L Dickens2013-01-033-9/+15
| | |\ \ \
| | * | | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ord...Michael L Dickens2013-01-0144-116/+188