summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* examples: updating many examples for changes in modules and namespaces.Tom Rondeau2013-03-1820-625/+797
* analog, digital: fixed control_loop-derived blocks to inherit control_loop fu...Tom Rondeau2013-03-1810-15/+27
* Merge branch 'next' of ssh://192.168.2.110/Users/git/gnuradio into nextTom Rondeau2013-03-18626-14142/+8135
|\
| * cleaning up, converting examples, etc.Tom Rondeau2013-03-1732-508/+468
| * qtgui: moving all qtgui headers to install into qtgui directory.Tom Rondeau2013-03-1756-137/+132
| * Merge remote-tracking branch 'mbant/ofdm-next' into nextTom Rondeau2013-03-1762-2446/+2167
| |\
| | * modtool: added tagged_stream block as an optionMartin Braun2013-03-173-21/+55
| | * digital: pimplified old blocksMartin Braun2013-03-1759-2425/+2112
| * | some more cleanup from past modifications.Tom Rondeau2013-03-176-135/+3
| * | core: moving core sincos functions back into core to act as deps for anything...Tom Rondeau2013-03-1710-56/+16
| * | core: removed i2c, sdr1000, microtune code.Tom Rondeau2013-03-1739-2953/+0
| * | core: removing blocks: align_on_samplenumbers, check_counting_s, fake_channel...Tom Rondeau2013-03-1729-2273/+3
| * | blocks: moved ctrlport_probes to gr-blocks. Removed from gnuradio-core.Tom Rondeau2013-03-1730-588/+610
| * | blocks: converting references to vector source/sink, null source/sink, nop, c...Tom Rondeau2013-03-17373-7003/+1794
| * | Merge branch 'master' into nextTom Rondeau2013-03-1770-1/+4900
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-03-170-0/+0
| | |\
| | * | blocks: changing vector_insert category location.Tom Rondeau2013-03-161-1/+1
| | * | blocks: moved nop, null source/sink, copy, vector_map to gr-blocks.Tom Rondeau2013-03-1624-12/+1136
| | * | blocks: moving copy, endian_swap, head, skiphead, vector_source/sink/insert t...Tom Rondeau2013-03-1653-1/+3776
| | * | core: adding default empty tags list argument to vector_source_x.set_data() f...Tim O'Shea2013-03-162-2/+2
| | * | blocks: adding correct link flags for log4cppTim O'Shea2013-03-162-1/+2
| | * | digital: fixed tagged_stream_mux xml and example GRC appJohnathan Corgan2013-03-162-14/+14
| | * | blocks: minor cleanup of added blocksJohnathan Corgan2013-03-162-5/+5
| | * | analog: minor cleanup for added blockJohnathan Corgan2013-03-164-6/+9
| | * | digital: fix QA tests for pmt importJohnathan Corgan2013-03-162-2/+2
| | * | Squash/rebased martin/ofdm-master onto trial merge branchMartin Braun2013-03-16144-117/+11557
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-03-18566-5849/+19273
|\| | |
| * | | atsc: installing all gr-atsc headers in gnuradio/atsc.Tom Rondeau2013-03-161-27/+50
| * | | Merge branch 'master' into nextTom Rondeau2013-03-161-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-03-16145-115/+11559
| | |\ \ | | | |/ | | |/|
| | * | filter: added callback to adjust resampling rate of pfb_arb_resampler block.Tom Rondeau2013-03-151-1/+2
| * | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-03-16145-146/+11748
| |\ \ \
| | * \ \ Merge branch 'master' into nextJohnathan Corgan2013-03-154-3/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | core: adding default empty tags list argument to vector_source_x.set_data() f...Tim O'Shea2013-03-152-2/+2
| | | * | blocks: adding correct link flags for log4cppTim O'Shea2013-03-152-1/+2
| | * | | Merge branch 'ofdm-master' into ofdm-nextJohnathan Corgan2013-03-15144-145/+11746
| | |\| |
| | | * | digital: fixed tagged_stream_mux xml and example GRC appJohnathan Corgan2013-03-152-14/+14
| | | * | blocks: minor cleanup of added blocksJohnathan Corgan2013-03-152-5/+5
| | | * | analog: minor cleanup for added blockJohnathan Corgan2013-03-154-6/+9
| | | * | digital: fix QA tests for pmt importJohnathan Corgan2013-03-152-2/+2
| | | * | Squash/rebased martin/ofdm-master onto trial merge branchMartin Braun2013-03-15144-117/+11557
| | | |/
| * | | atsc: adjustments to atsc to start to conform to v3.7 structure.Tom Rondeau2013-03-15196-424/+481
| * | | pager: fixed header install directory (copy/paste error).Tom Rondeau2013-03-151-2/+2
| * | | ctrlport: updating examples.Tom Rondeau2013-03-152-229/+229
| |/ /
| * | Merge branch 'master' into nextJohnathan Corgan2013-03-140-0/+0
| |\|
| | * Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-03-142-2/+2
| | |\
| * | | ctrlport: updated PC plotting tool to keep sorted state when sorting off.Tom Rondeau2013-03-141-5/+22
| * | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-03-140-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' into nextJohnathan Corgan2013-03-140-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'maint'Johnathan Corgan2013-03-142-2/+2
| | | |\ \