| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into next | Johnathan Corgan | 2013-02-17 | 1 | -0/+1 |
|\ |
|
| * | blocks: added missing include for gruel thread | Josh Blum | 2013-02-17 | 1 | -0/+1 |
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-12 | 1 | -1/+1 |
|\| |
|
| * | build: fixing generated includes, deps, and header installation. | Tom Rondeau | 2013-02-12 | 1 | -1/+1 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-07 | 1 | -4/+4 |
|\| |
|
| * | blocks: fix use of bare boost::mutex::scoped_lock | Johnathan Corgan | 2013-02-07 | 1 | -4/+4 |
* | | build: fixing earlier fix on generating and installing headers. | Tom Rondeau | 2013-02-05 | 1 | -2/+2 |
* | | build: generated headers naming issue fixed. | Tom Rondeau | 2013-02-05 | 1 | -2/+2 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2013-01-14 | 1 | -0/+1 |
|\| |
|
| * | block: file_source_impl missing mutex include | Josh Blum | 2013-01-14 | 1 | -0/+1 |
* | | merge of fix_build_dir_order, fix conflict | Michael L Dickens | 2013-01-07 | 1 | -4/+0 |
|\| |
|
| * | remove unnecessary build commands | Michael L Dickens | 2013-01-04 | 1 | -4/+0 |
* | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ... | Michael L Dickens | 2013-01-04 | 2 | -7/+11 |
|\| |
|
| * | Merge branch 'master' of http://gnuradio.org/git/gnuradio into fix_build_dir_... | Michael L Dickens | 2013-01-03 | 2 | -8/+14 |
| |\ |
|
| * | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ord... | Michael L Dickens | 2013-01-01 | 2 | -5/+9 |
* | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-01-02 | 2 | -8/+14 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into next | Johnathan Corgan | 2013-01-02 | 2 | -8/+14 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | blocks: fixed file_meta_sink/source_impl MSVC incompatibliity error | Nicholas Corgan | 2013-01-02 | 2 | -8/+14 |
| | |/ |
|
* | | | Merge branch 'pmt_rename' into next | Tom Rondeau | 2013-01-02 | 4 | -133/+132 |
|\ \ \
| |/ /
|/| | |
|
| * | | gruel: using new pmt naming. | Tom Rondeau | 2012-12-21 | 2 | -60/+59 |
| * | | gruel: updating all GR blocks that use PMTs to use new naming. | Tom Rondeau | 2012-12-21 | 2 | -73/+73 |
* | | | blocks: removes blocks moved to gr-blocks from gnuradio-core. | Tom Rondeau | 2012-12-21 | 11 | -60/+694 |
|/ / |
|
* | | Merge branch 'master' into next | Tom Rondeau | 2012-12-15 | 2 | -20/+30 |
|\| |
|
| * | blocks: fixing up QA of metadata to not rely on non-dependency components. | Tom Rondeau | 2012-12-15 | 1 | -17/+22 |
| * | blocks: fixing up metadata parser. | Tom Rondeau | 2012-12-15 | 1 | -3/+8 |
* | | Merge branch 'master' into next | Tom Rondeau | 2012-12-14 | 22 | -0/+3802 |
|\| |
|
| * | blocks: moving file metadata sink/source to gr-blocks. | Tom Rondeau | 2012-12-14 | 22 | -0/+3802 |
* | | Merge branch 'master' into next | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
|\| |
|
| * | build: removing GR_SWIG_TARGET deps from new component gr-blocks. | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
| * | blocks: apply changes to file source in core to one in gr-blocks. | Tom Rondeau | 2012-12-11 | 4 | -26/+114 |
* | | blocks: apply changes to file source in core to one in gr-blocks. | Tom Rondeau | 2012-12-11 | 4 | -26/+114 |
* | | Merge branch 'master' into next | Tom Rondeau | 2012-12-03 | 3 | -1/+3 |
|\| |
|
| * | Docs: Fixing Doxygen markup for missing constructor parameters. | Tom Rondeau | 2012-12-03 | 3 | -1/+3 |
* | | Merge branch 'master' into next | Tom Rondeau | 2012-11-28 | 1 | -1/+1 |
|\| |
|
| * | blocks: fix for qa_patterned_interleaver. | Tom Rondeau | 2012-11-28 | 1 | -1/+1 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-28 | 2 | -4/+60 |
|\| |
|
| * | patterned qa added, bugs fixed | Tim O'Shea | 2012-11-28 | 2 | -4/+60 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-28 | 7 | -0/+242 |
|\| |
|
| * | adding patterned interleaver block | Tim O'Shea | 2012-11-28 | 7 | -0/+242 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-26 | 2 | -3/+3 |
|\| |
|
| * | blocks: fix initializer order warning | Johnathan Corgan | 2012-11-26 | 2 | -3/+3 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-24 | 1 | -1/+1 |
|\| |
|
| * | blocks: fix required libs in .pc file | Johnathan Corgan | 2012-11-24 | 1 | -1/+1 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-14 | 1 | -7/+7 |
|\| |
|
| * | gr: apply pattern for g37f7522 and gc4c0ce9 to gr-analog and gr-blocks | Johnathan Corgan | 2012-11-14 | 1 | -7/+7 |
* | | blocks: fix includes to also include generated files | Johnathan Corgan | 2012-11-10 | 1 | -0/+1 |
|/ |
|
* | Merge branch 'maint' | Johnathan Corgan | 2012-11-04 | 1 | -1/+1 |
* | blocks: fix XML definitions for block tree | Johnathan Corgan | 2012-10-05 | 2 | -23/+23 |
* | blocks: fixed MSVC compatibility issue | Nicholas Corgan | 2012-10-03 | 2 | -0/+97 |
* | blocks: added gr::blocks::file_source | Johnathan Corgan | 2012-09-05 | 8 | -0/+328 |