summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Johnathan Corgan2013-01-151-3/+5
|\
| * grc: fixed problem of GRC_BLOCKS_PATH not being set in WindowsNicholas Corgan2013-01-151-3/+5
* | 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
| |/ /
* | | 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 '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
* | | core: adding gr_random_pdu message passing blockTim O'Shea2013-01-145-0/+213
* | | 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
* | | | 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
* | | remove unnecessary build commandsMichael L Dickens2013-01-041-4/+0
* | | 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
|\ \ \
| * \ \ Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-01-022-8/+14
| |\ \ \
| | * | | blocks: fixed file_meta_sink/source_impl MSVC incompatibliity errorNicholas Corgan2013-01-022-8/+14
| * | | | docs: fixing typo.Tom Rondeau2013-01-021-1/+1
| |/ / /
* | | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ord...Michael L Dickens2013-01-0144-116/+188
* | | | GNU Radio version of CMake's "UseQt4" script, which determines header (INCLUD...Michael L Dickens2013-01-011-0/+156
|/ / /
* | | core: fixed some unused parameter warningsAlexandru Csete2012-12-312-11/+11
* | | Merge branch 'maint'Johnathan Corgan2012-12-291-1/+2
|\ \ \
| * | | cmake: removed Boost 1.52 from allowed versionsmaint-3.6.2Johnathan Corgan2012-12-291-1/+2
* | | | cmake: update revision to 3.6.3rc0v3.6.3rc0Johnathan Corgan2012-12-231-2/+2
* | | | Merge branch 'maint'Johnathan Corgan2012-12-201-0/+1
|\| | |
| * | | Revert "gruel: remove erroneous include path from cmake"Nicholas Corgan2012-12-141-0/+1
* | | | Merge remote-tracking branch 'ncorgan/pdu_fix'Johnathan Corgan2012-12-206-16/+23
|\ \ \ \
| * | | | core: fixed pdu MSVC compatibility issuesNicholas Corgan2012-12-206-16/+23
* | | | | gruel: adding a 'pmt_from_complex' call (more clear than pmt_make_rectangular).Tom Rondeau2012-12-204-0/+30
* | | | | gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.Tom Rondeau2012-12-193-31/+43
|/ / / /
* | | | Merge branch 'tagdebug2' of git://github.com/mbant/gnuradioTom Rondeau2012-12-181-2/+2
|\ \ \ \
| * | | | core: gr_tag_debug handles lacking srcidMartin Braun2012-12-181-2/+2
| | |/ / | |/| |
* | | | docs: Restructuring main page to point to new pages describing features in GR.Tom Rondeau2012-12-182-0/+9
* | | | docs: added a doxygen manual page describing PMT types and how to use them.Tom Rondeau2012-12-181-0/+348
* | | | docs: Adding a page describing the message passing interface.Tom Rondeau2012-12-181-0/+266
|/ / /
* | | gruel: changing PMT (de)serialize of complex to make more portable (apparentl...Tom Rondeau2012-12-171-8/+8