summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-03-142-2/+2
|\
| * Merge branch 'maint'Johnathan Corgan2013-03-142-2/+2
| |\
| | * modtool: fixed general python block templateMike Jameson2013-03-141-1/+1
| | * modtool: Python general blocks used grextras syntaxMartin Braun2013-03-141-1/+1
| | * docs: fixing a section name collision.Tom Rondeau2013-03-141-1/+1
| | * core: boost::filename3::path::/ operator works on older boost verions than /=Tim O'Shea2013-03-141-1/+1
* | | blocks: fixed probe_signal_vx vector utilisationMike Jameson2013-03-141-0/+2
|/ /
* | blocks: fixing some UDP handling of ports/options; using gr-blocks blocks in QA.Tom Rondeau2013-03-133-12/+31
* | Merge remote-tracking branch 'm0mik/modtool_general_python_template_fix'Tom Rondeau2013-03-131-1/+1
|\ \
| * | modtool: fixed general python block templateMike Jameson2013-03-121-1/+1
* | | Merge remote-tracking branch 'mbant/grmodtool'Tom Rondeau2013-03-131-1/+1
|\ \ \
| * | | modtool: Python general blocks used grextras syntaxMartin Braun2013-03-121-1/+1
| |/ /
* | | docs: fixes for doxygen warnings (and a simple build warning).Tom Rondeau2013-03-133-3/+5
* | | log: fixes to replace log4cxx with log4cpp.Tom Rondeau2013-03-139-68/+54
* | | blocks: This is C++, not Python.Tom Rondeau2013-03-131-2/+2
* | | log: replacing log4cxx with log4cpp.Tom Rondeau2013-03-1328-103/+163
* | | Merge remote-tracking branch 'gr3.7_log4cpp'Tom Rondeau2013-03-1313-367/+478
|\ \ \
| * | | Converted gr_logger to use log4cppuser2013-03-1211-311/+478
* | | | Merge remote-tracking branch 'ncorgan/msvc_fixes'Tom Rondeau2013-03-133-2/+3
|\ \ \ \
| * | | | MSVC fixesNicholas Corgan2013-03-123-2/+3
| | |/ / | |/| |
* | | | blocks: adding probe_rate blockTim O'Shea2013-03-138-3/+314
* | | | blocks: adding default arg value to mute_XX.Tim O'Shea2013-03-131-2/+2
* | | | blocks: actually adding the udp_source blocks.Tom Rondeau2013-03-134-0/+446
* | | | blocks: udp_sink and udp_source implemented in gr-blocks using boost::asio in...Tom Rondeau2013-03-139-0/+501
|/ / /
* | | blocks: moved file sink and base and descriptor source/sink to gr-blocks.Tom Rondeau2013-03-1019-0/+1201
* | | blocks: moving control_loop into gr-blocks.Tom Rondeau2013-03-094-0/+449
* | | blocks: moved tagged_file_sink and wavfile source/sink/base to gr-blocks.Tom Rondeau2013-03-0922-1/+1817
* | | blocks: moving vco/nco bases to gr-blocks.Tom Rondeau2013-03-0819-6/+1114
* | | blocks: moved fxpt generators to gr-blocks.Tom Rondeau2013-03-0717-0/+2154
* | | core: moving over setting of max_messages option to conf.in file.Tom Rondeau2013-03-072-2/+6
* | | Merge branch 'maint'Tom Rondeau2013-03-073-6/+37
|\ \ \ | | |/ | |/|
| * | core: protect against popping a message off the queue if no handler is attached.Tom Rondeau2013-03-074-6/+41
* | | blocks: did my best to provide some documentation for the bin_statistics block.Tom Rondeau2013-03-071-0/+11
* | | blocks: moving bin_statistics_f into gr-blocks.Tom Rondeau2013-03-077-0/+557
* | | blocks: moved burst_tagger to gr-blocks.Tom Rondeau2013-03-069-0/+402
| |/ |/|
* | Merge remote-tracking branch 'benreynwar/large_ampls_to_corners'Tom Rondeau2013-03-068-37/+398
|\ \
| * | digital: Adding a QAM-like constellation with 32 points.Ben Reynwar2013-03-063-0/+80
| * | digital: Making qa_constellation_receiver more reliable.Ben Reynwar2013-03-062-31/+71
| * | digital: Adding option to QAM to help with frequency locking.Ben Reynwar2013-03-065-11/+252
* | | blocks: moving tag_debug block to gr-blocks.Tom Rondeau2013-03-069-0/+388
* | | blocks: moving peak_detector and moving_average to gr-blocks.Tom Rondeau2013-03-0615-1/+920
* | | blocks: moving message blocks to gr-blocks.Tom Rondeau2013-03-0625-0/+1622
* | | Added Windows DLL resource filesNicholas Corgan2013-03-0539-17/+1289
|/ /
* | Merge branch 'maint'Tom Rondeau2013-03-050-0/+0
|\|
| * prefs: pass strings by reference. Also cleans up a comma in gr_modtool that m...Tom Rondeau2013-03-054-29/+30
* | prefs: pass strings by reference. Also cleans up a comma in gr_modtool that m...Tom Rondeau2013-03-054-29/+30
* | blocks: added includes necessary for Windows compilationNicholas Corgan2013-03-052-0/+5
* | build: install our cmake modules into share/gnuradio/cmake/Modules.Tom Rondeau2013-03-051-0/+8
* | build: create and install a config.h so external projects can know what we bu...Tom Rondeau2013-03-052-0/+46
* | log: simplifying makefile since this variable is always set, even if blank.Tom Rondeau2013-03-051-5/+1