| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into next | Johnathan Corgan | 2013-03-14 | 0 | -0/+0 |
|\ |
|
| * | Merge branch 'master' of gnuradio.org:gnuradio | Tom Rondeau | 2013-03-14 | 2 | -2/+2 |
| |\ |
|
* | | | ctrlport: updated PC plotting tool to keep sorted state when sorting off. | Tom Rondeau | 2013-03-14 | 1 | -5/+22 |
* | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-03-14 | 0 | -0/+0 |
|\ \ \ |
|
| * \ \ | Merge branch 'master' into next | Johnathan Corgan | 2013-03-14 | 0 | -0/+0 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge branch 'maint' | Johnathan Corgan | 2013-03-14 | 2 | -2/+2 |
| | |\ \ |
|
| | | * | | modtool: fixed general python block template | Mike Jameson | 2013-03-14 | 1 | -1/+1 |
| | | * | | modtool: Python general blocks used grextras syntax | Martin Braun | 2013-03-14 | 1 | -1/+1 |
| | | * | | docs: fixing a section name collision. | Tom Rondeau | 2013-03-14 | 1 | -1/+1 |
| | | * | | core: boost::filename3::path::/ operator works on older boost verions than /= | Tim O'Shea | 2013-03-14 | 1 | -1/+1 |
* | | | | | ctrlport: new performance monitoring tool using networkx and matplotlib. | Tom Rondeau | 2013-03-14 | 1 | -0/+710 |
* | | | | | core: changed PC get functions to return instantaneous value. Average values ... | Tom Rondeau | 2013-03-14 | 4 | -18/+242 |
* | | | | | ctrlport: updated examples for controlport use. | Tom Rondeau | 2013-03-14 | 2 | -244/+667 |
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-14 | 1 | -0/+2 |
|\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | blocks: fixed probe_signal_vx vector utilisation | Mike Jameson | 2013-03-14 | 1 | -0/+2 |
| |/ / |
|
* | | | analog: added some documentation for a number of blocks. | Tom Rondeau | 2013-03-13 | 15 | -24/+139 |
* | | | grc: fixed some GRC definitions. | Tom Rondeau | 2013-03-13 | 2 | -8/+10 |
* | | | core: removing gri_add_const_ss -- this should be handled in VOLK. | Tom Rondeau | 2013-03-13 | 3 | -87/+0 |
* | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-13 | 3 | -12/+31 |
|\| | |
|
| * | | blocks: fixing some UDP handling of ports/options; using gr-blocks blocks in QA. | Tom Rondeau | 2013-03-13 | 3 | -12/+31 |
* | | | blocks: removing udp_source/sink from gnuradio-core; now in gr-blocks. | Tom Rondeau | 2013-03-13 | 21 | -1279/+14 |
* | | | audio: minor master merge fix. | Tom Rondeau | 2013-03-13 | 3 | -1/+3 |
* | | | cmake: added a FindGnuradio.cmake module that other programs can use to easil... | Tim O'Shea | 2013-03-13 | 1 | -0/+105 |
* | | | channels: fix for duplicate export | Tim O'Shea | 2013-03-13 | 1 | -15/+0 |
* | | | Merge remote-tracking branch 'ncorgan/next_dll_fix' into next | Tom Rondeau | 2013-03-13 | 2 | -2/+2 |
|\ \ \ |
|
| * | | | Fixed where Windows builds look for GrVersion.cmake | Nicholas Corgan | 2013-03-12 | 2 | -2/+2 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-13 | 54 | -510/+1555 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge remote-tracking branch 'm0mik/modtool_general_python_template_fix' | Tom Rondeau | 2013-03-13 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | modtool: fixed general python block template | Mike Jameson | 2013-03-12 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'mbant/grmodtool' | Tom Rondeau | 2013-03-13 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | modtool: Python general blocks used grextras syntax | Martin Braun | 2013-03-12 | 1 | -1/+1 |
| | |/ / / |
|
| * | | | | docs: fixes for doxygen warnings (and a simple build warning). | Tom Rondeau | 2013-03-13 | 3 | -3/+5 |
| * | | | | log: fixes to replace log4cxx with log4cpp. | Tom Rondeau | 2013-03-13 | 9 | -68/+54 |
| * | | | | blocks: This is C++, not Python. | Tom Rondeau | 2013-03-13 | 1 | -2/+2 |
| * | | | | log: replacing log4cxx with log4cpp. | Tom Rondeau | 2013-03-13 | 28 | -103/+163 |
| * | | | | Merge remote-tracking branch 'gr3.7_log4cpp' | Tom Rondeau | 2013-03-13 | 13 | -367/+478 |
| |\ \ \ \ |
|
| | * | | | | Converted gr_logger to use log4cpp | user | 2013-03-12 | 11 | -311/+478 |
| * | | | | | Merge remote-tracking branch 'ncorgan/msvc_fixes' | Tom Rondeau | 2013-03-13 | 3 | -2/+3 |
| |\ \ \ \ \ |
|
| | * | | | | | MSVC fixes | Nicholas Corgan | 2013-03-12 | 3 | -2/+3 |
| | | |/ / /
| | |/| | | |
|
| * | | | | | blocks: adding probe_rate block | Tim O'Shea | 2013-03-13 | 8 | -3/+314 |
| * | | | | | blocks: adding default arg value to mute_XX. | Tim O'Shea | 2013-03-13 | 1 | -2/+2 |
| * | | | | | blocks: actually adding the udp_source blocks. | Tom Rondeau | 2013-03-13 | 4 | -0/+446 |
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-13 | 9 | -0/+501 |
|\| | | | |
| |_|_|/ /
|/| | | | |
|
| * | | | | blocks: udp_sink and udp_source implemented in gr-blocks using boost::asio in... | Tom Rondeau | 2013-03-13 | 9 | -0/+501 |
| |/ / / |
|
* | | | | blocks: removing file_sink/source file_descriptor_sink/source form core and m... | Tom Rondeau | 2013-03-10 | 81 | -1592/+196 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-10 | 19 | -0/+1201 |
|\| | | |
|
| * | | | blocks: moved file sink and base and descriptor source/sink to gr-blocks. | Tom Rondeau | 2013-03-10 | 19 | -0/+1201 |
* | | | | blocks: removing gri_control_loop; using gr::blocks::control_loop now. | Tom Rondeau | 2013-03-10 | 24 | -586/+87 |
* | | | | Merge branch 'master' into next | Tom Rondeau | 2013-03-09 | 4 | -0/+449 |
|\| | | |
|
| * | | | blocks: moving control_loop into gr-blocks. | Tom Rondeau | 2013-03-09 | 4 | -0/+449 |