summaryrefslogtreecommitdiff
path: root/gr-blocks
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2013-02-171-0/+1
|\
| * blocks: added missing include for gruel threadJosh Blum2013-02-171-0/+1
* | Merge branch 'master' into nextTom Rondeau2013-02-121-1/+1
|\|
| * build: fixing generated includes, deps, and header installation.Tom Rondeau2013-02-121-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2013-02-071-4/+4
|\|
| * blocks: fix use of bare boost::mutex::scoped_lockJohnathan Corgan2013-02-071-4/+4
* | build: fixing earlier fix on generating and installing headers.Tom Rondeau2013-02-051-2/+2
* | build: generated headers naming issue fixed.Tom Rondeau2013-02-051-2/+2
* | Merge branch 'master' into nextJohnathan Corgan2013-01-141-0/+1
|\|
| * block: file_source_impl missing mutex includeJosh Blum2013-01-141-0/+1
* | 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 master/fix_build_dir_order into next, then fix conflicts and redo come ...Michael L Dickens2013-01-042-7/+11
|\|
| * Merge branch 'master' of http://gnuradio.org/git/gnuradio into fix_build_dir_...Michael L Dickens2013-01-032-8/+14
| |\
| * | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ord...Michael L Dickens2013-01-012-5/+9
* | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-01-022-8/+14
|\ \ \
| * \ \ Merge branch 'master' into nextJohnathan Corgan2013-01-022-8/+14
| |\ \ \ | | | |/ | | |/|
| | * | blocks: fixed file_meta_sink/source_impl MSVC incompatibliity errorNicholas Corgan2013-01-022-8/+14
| | |/
* | | Merge branch 'pmt_rename' into nextTom Rondeau2013-01-024-133/+132
|\ \ \ | |/ / |/| |
| * | gruel: using new pmt naming.Tom Rondeau2012-12-212-60/+59
| * | gruel: updating all GR blocks that use PMTs to use new naming.Tom Rondeau2012-12-212-73/+73
* | | blocks: removes blocks moved to gr-blocks from gnuradio-core.Tom Rondeau2012-12-2111-60/+694
|/ /
* | Merge branch 'master' into nextTom Rondeau2012-12-152-20/+30
|\|
| * blocks: fixing up QA of metadata to not rely on non-dependency components.Tom Rondeau2012-12-151-17/+22
| * blocks: fixing up metadata parser.Tom Rondeau2012-12-151-3/+8
* | Merge branch 'master' into nextTom Rondeau2012-12-1422-0/+3802
|\|
| * blocks: moving file metadata sink/source to gr-blocks.Tom Rondeau2012-12-1422-0/+3802
* | Merge branch 'master' into nextTom Rondeau2012-12-121-2/+0
|\|
| * build: removing GR_SWIG_TARGET deps from new component gr-blocks.Tom Rondeau2012-12-121-2/+0
| * blocks: apply changes to file source in core to one in gr-blocks.Tom Rondeau2012-12-114-26/+114
* | blocks: apply changes to file source in core to one in gr-blocks.Tom Rondeau2012-12-114-26/+114
* | Merge branch 'master' into nextTom Rondeau2012-12-033-1/+3
|\|
| * Docs: Fixing Doxygen markup for missing constructor parameters.Tom Rondeau2012-12-033-1/+3
* | Merge branch 'master' into nextTom Rondeau2012-11-281-1/+1
|\|
| * blocks: fix for qa_patterned_interleaver.Tom Rondeau2012-11-281-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2012-11-282-4/+60
|\|
| * patterned qa added, bugs fixedTim O'Shea2012-11-282-4/+60
* | Merge branch 'master' into nextJohnathan Corgan2012-11-287-0/+242
|\|
| * adding patterned interleaver blockTim O'Shea2012-11-287-0/+242
* | Merge branch 'master' into nextJohnathan Corgan2012-11-262-3/+3
|\|
| * blocks: fix initializer order warningJohnathan Corgan2012-11-262-3/+3
* | Merge branch 'master' into nextJohnathan Corgan2012-11-241-1/+1
|\|
| * blocks: fix required libs in .pc fileJohnathan Corgan2012-11-241-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2012-11-141-7/+7
|\|
| * gr: apply pattern for g37f7522 and gc4c0ce9 to gr-analog and gr-blocksJohnathan Corgan2012-11-141-7/+7
* | blocks: fix includes to also include generated filesJohnathan Corgan2012-11-101-0/+1
|/
* Merge branch 'maint'Johnathan Corgan2012-11-041-1/+1
* blocks: fix XML definitions for block treeJohnathan Corgan2012-10-052-23/+23
* blocks: fixed MSVC compatibility issueNicholas Corgan2012-10-032-0/+97
* blocks: added gr::blocks::file_sourceJohnathan Corgan2012-09-058-0/+328