summaryrefslogtreecommitdiff
path: root/gr-blocks
Commit message (Expand)AuthorAgeFilesLines
* uninstalled import: Updatings blocks, fec, uhd, and filter so that uninstalle...Ben Reynwar2013-06-0427-62/+29
* uninstalled imports: Fixing up after merge with master.Ben Reynwar2013-06-031-1/+1
* Merged in master.Ben Reynwar2013-06-0310-98/+104
|\
| * replace use of deprecated fractional_interpolator.Tom Rondeau2013-05-231-90/+90
| * build: cleaning up swig, fixing a few bugs.Tom Rondeau2013-05-234-4/+0
| * build: fixed up feval/py_feval use and destructors.Tom Rondeau2013-05-231-9/+2
| * Merge branch 'next' of git.gnuradio.org:gnuradio into nextTom Rondeau2013-05-233-2/+5
| |\
| | * Merge branch 'master' into nextJohnathan Corgan2013-05-223-2/+5
| | |\
| | | * blocks: pdu_to_tagged_stream_impl fix get messageJosh Blum2013-05-221-1/+1
| | | * udp: fix udp_source to avoid permanent work blockageJosh Blum2013-05-221-1/+3
| * | | build: move from using runtime_swig.i to gnuradio.i to reduce memory load whi...Tom Rondeau2013-05-236-6/+20
| |/ /
* | | Merged in next_docs branch.Ben Reynwar2013-05-19430-2774/+2561
|\| |
| * | Merge with next branch.Ben Reynwar2013-05-1910-9/+15
| |\ \
| | * | docstrings: Improving subpackage docstrings.Ben Reynwar2013-05-101-2/+1
| | * | docs: Include generated header files when generating doxygen documentation.Ben Reynwar2013-04-261-1/+4
| * | | blocks: add set_msg callback and api update to grc block_message_probeTim O'Shea2013-05-161-1/+2
| * | | Merge branch 'next' into runtime_pimplJohnathan Corgan2013-05-139-1/+309
| |\ \ \
| | * \ \ Merge branch 'master-ofdm', fixed conflictsMartin Braun2013-05-129-2/+309
| | |\ \ \ | | | | |/ | | | |/|
| | | * | blocks: Added tag gateMartin Braun2013-05-119-2/+311
| * | | | Merge branch 'next' into runtime_pimplJohnathan Corgan2013-05-126-14/+32
| |\| | |
| * | | | build: minor tweaks for swig, warnings.Tom Rondeau2013-05-082-2/+2
| * | | | runtime: fix SWIG type issue for 32-bitJohnathan Corgan2013-05-021-3/+0
| * | | | runtime: converting runtime core to gr namespace, gnuradio include dir.Tom Rondeau2013-04-29421-2771/+2250
| * | | | blocks: fix file meta data source to handle repeat of files.Tom Rondeau2013-04-291-3/+11
* | | | | Merged in 'next' branch.Ben Reynwar2013-05-10149-332/+1373
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | docs: Minor improvements to documentation in header files.Ben Reynwar2013-04-268-6/+10
| | |/ / | |/| |
| * | | Merge branch 'master' into nextJohnathan Corgan2013-04-241-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | blocks: fixed header documentation in repack_bits_bbJohnathan Corgan2013-04-241-1/+1
| * | | blocks: interleaved_short_to_complex switch to volk, allow vector short input...Tim O'Shea2013-04-185-12/+30
| * | | Merge branch 'master' into nextTom Rondeau2013-04-151-3/+11
| |\| | | | |/ | |/|
| | * Merge branch 'maint'Tom Rondeau2013-04-151-3/+11
| | |\
| | | * blocks: fix file meta data source to handle repeat of files.Tom Rondeau2013-04-151-3/+11
| | * | blocks: removing old blocks_swig.i file.Tom Rondeau2013-04-051-602/+0
| * | | blocks: remove use of assertGreater in test to go back to support Python 2.5.Tom Rondeau2013-04-051-2/+2
| * | | build: updates to blocks swig structure for next.Tom Rondeau2013-04-054-7/+42
| * | | build: uniform handling of controlport vars in swig.Tom Rondeau2013-04-051-1/+0
| * | | Merge branch 'master' into nextTom Rondeau2013-04-055-11/+729
| |\| |
| | * | blocks: split blocks swig into 3 files to be swigged individually.Tom Rondeau2013-04-055-8/+727
| * | | Merge branch 'master' into nextTom Rondeau2013-04-041-4/+0
| |\| |
| | * | build: only ever include "config.h" in source (.cc) files.Tom Rondeau2013-04-041-4/+0
| | * | Merge branch 'master_grc_components'Tom Rondeau2013-04-04122-276/+522
| | |\ \
| * | | | grc: fixing up new next structure blocks for GRC categories.Tom Rondeau2013-04-048-5/+22
| * | | | Merge branch 'master_grc_components' into next_grc_componentsTom Rondeau2013-04-04122-278/+521
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | docs: updating Doxygen categories for all blocks.Tom Rondeau2013-04-04119-187/+408
| | * | | grc: removed 'old' grc keys from block_tree.Tom Rondeau2013-04-043-89/+114
| * | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-04-034-7/+7
| |\ \ \ \
| | * | | | cmake: fix packaging categories to use runtime vs. coreJohnathan Corgan2013-04-034-7/+7
| * | | | | build: cmake updates to find ICE when not installed in /usr.Tom Rondeau2013-04-032-0/+2
| |/ / / /
| * | | | Merge branch 'master' into nextJohnathan Corgan2013-04-032-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'ncorgan/msvc_master_blocks_fixes'Johnathan Corgan2013-04-032-1/+2
| | |\ \ \ | | | |/ / | | |/| |