summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \
| | | * | 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
* | | | | ctrlport: new performance monitoring tool using networkx and matplotlib.Tom Rondeau2013-03-141-0/+710
* | | | | core: changed PC get functions to return instantaneous value. Average values ...Tom Rondeau2013-03-144-18/+242
* | | | | ctrlport: updated examples for controlport use.Tom Rondeau2013-03-142-244/+667
* | | | | Merge branch 'master' into nextTom Rondeau2013-03-141-0/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | blocks: fixed probe_signal_vx vector utilisationMike Jameson2013-03-141-0/+2
| |/ /
* | | analog: added some documentation for a number of blocks.Tom Rondeau2013-03-1315-24/+139
* | | grc: fixed some GRC definitions.Tom Rondeau2013-03-132-8/+10
* | | core: removing gri_add_const_ss -- this should be handled in VOLK.Tom Rondeau2013-03-133-87/+0
* | | Merge branch 'master' into nextTom Rondeau2013-03-133-12/+31
|\| |
| * | blocks: fixing some UDP handling of ports/options; using gr-blocks blocks in QA.Tom Rondeau2013-03-133-12/+31
* | | blocks: removing udp_source/sink from gnuradio-core; now in gr-blocks.Tom Rondeau2013-03-1321-1279/+14
* | | audio: minor master merge fix.Tom Rondeau2013-03-133-1/+3
* | | cmake: added a FindGnuradio.cmake module that other programs can use to easil...Tim O'Shea2013-03-131-0/+105
* | | channels: fix for duplicate exportTim O'Shea2013-03-131-15/+0
* | | Merge remote-tracking branch 'ncorgan/next_dll_fix' into nextTom Rondeau2013-03-132-2/+2
|\ \ \
| * | | Fixed where Windows builds look for GrVersion.cmakeNicholas Corgan2013-03-122-2/+2
* | | | Merge branch 'master' into nextTom Rondeau2013-03-1354-510/+1555
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | | | Merge branch 'master' into nextTom Rondeau2013-03-139-0/+501
|\| | | | | | |_|_|/ / |/| | | |
| * | | | blocks: udp_sink and udp_source implemented in gr-blocks using boost::asio in...Tom Rondeau2013-03-139-0/+501
| |/ / /
* | | | blocks: removing file_sink/source file_descriptor_sink/source form core and m...Tom Rondeau2013-03-1081-1592/+196
* | | | Merge branch 'master' into nextTom Rondeau2013-03-1019-0/+1201
|\| | |
| * | | blocks: moved file sink and base and descriptor source/sink to gr-blocks.Tom Rondeau2013-03-1019-0/+1201
* | | | blocks: removing gri_control_loop; using gr::blocks::control_loop now.Tom Rondeau2013-03-1024-586/+87
* | | | Merge branch 'master' into nextTom Rondeau2013-03-094-0/+449
|\| | |
| * | | blocks: moving control_loop into gr-blocks.Tom Rondeau2013-03-094-0/+449