gnuradio.git - GNU Radio

	Commit message (Collapse)	Author	Age	Files	Lines
*	uninstalled import: Updatings blocks, fec, uhd, and filter so that ↵	Ben Reynwar	2013-06-04	27	-62/+29
\| \| \| \|	uninstalled import works with recent changes.
*	uninstalled imports: Fixing up after merge with master.	Ben Reynwar	2013-06-03	1	-1/+1
\|
*	Merged in master.	Ben Reynwar	2013-06-03	1	-0/+1
\|\
\| *	Merge branch 'master' into next	Johnathan Corgan	2013-05-22	1	-0/+1
\| \|\
* \| \|	Merged in next_docs branch.	Ben Reynwar	2013-05-19	6	-10/+57
\|\\| \|
\| * \|	Merge with next branch.	Ben Reynwar	2013-05-19	1	-2/+1
\| \|\ \
\| \| * \|	docstrings: Improving subpackage docstrings.	Ben Reynwar	2013-05-10	1	-2/+1
\| \| \| \|
\| * \| \|	Merge branch 'next' into runtime_pimpl	Johnathan Corgan	2013-05-13	1	-0/+47
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-blocks/swig/blocks_swig0.i gr-digital/lib/ofdm_chanest_vcvc_impl.cc gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h gr-digital/lib/ofdm_sync_sc_cfb_impl.cc gr-digital/lib/packet_header_default.cc gr-digital/lib/packet_headerparser_b_impl.cc
\| \| * \ \	Merge branch 'master-ofdm', fixed conflicts	Martin Braun	2013-05-12	1	-0/+47
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| / \| \| \| \|/
\| \| \| *	blocks: Added tag gate	Martin Braun	2013-05-11	1	-0/+49
\| \| \| \|
\| * \| \|	runtime: converting runtime core to gr namespace, gnuradio include dir.	Tom Rondeau	2013-04-29	4	-8/+9
\| \|/ /
* \| \|	Merged in 'next' branch.	Ben Reynwar	2013-05-10	1	-2/+2
\|\\| \|
\| * \|	blocks: remove use of assertGreater in test to go back to support Python 2.5.	Tom Rondeau	2013-04-05	1	-2/+2
\| \| \|
* \| \|	Merged next into uninstalled import branch.	Ben Reynwar	2013-04-02	64	-297/+2724
\|\\| \|
\| * \|	gruel: moved gruel into subdirs of gnuradio-runtime.	Tom Rondeau	2013-04-01	2	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \|	PMTs are handled slightly different and are installed into their own module and include dir.
\| * \|	uhd: include directory naming bug fixed.	Tom Rondeau	2013-03-29	1	-0/+50
\| \| \|
\| * \|	blocks: if ControlPort is disabled, do not run its QA tests.	Tom Rondeau	2013-03-27	1	-0/+13
\| \| \|
\| * \|	runtime: build structure updates so ControlPort is usable in QA and once ↵	Tom Rondeau	2013-03-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	installed.
\| * \|	runtime: migrate remaining gnuradio-core contents into gnuradio-runtime	Johnathan Corgan	2013-03-26	1	-0/+1
\| \| \|
\| * \|	blocks: removed plateau from gr-analog; now in gr-blocks.	Tom Rondeau	2013-03-18	1	-2/+2
\| \| \|
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-18	1	-0/+46
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-blocks/include/blocks/CMakeLists.txt gr-blocks/lib/CMakeLists.txt gr-blocks/swig/blocks_swig.i gr-digital/lib/digital_ofdm_sync_sc_cfb.cc
\| \| *	blocks: copied plateau_detector from analog to blocks.	Tom Rondeau	2013-03-18	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \|	This will be removed from gr-analog on next, but I already removed it from any GRC categories to discourage its use.
\| * \|	blocks: moved ctrlport_probes to gr-blocks. Removed from gnuradio-core.	Tom Rondeau	2013-03-17	1	-2/+2
\| \| \|
\| * \|	blocks: converting references to vector source/sink, null source/sink, nop, ↵	Tom Rondeau	2013-03-17	51	-404/+1508
\| \| \| \| \| \| \| \| \| \| \| \|	copy, head, skiphead, vector_map, and annotator blocks to use gr-blocks.
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-17	8	-0/+549
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-blocks/swig/blocks_swig.i
\| \| *	blocks: moved nop, null source/sink, copy, vector_map to gr-blocks.	Tom Rondeau	2013-03-16	3	-1/+151
\| \| \|
\| \| *	blocks: moving copy, endian_swap, head, skiphead, vector_source/sink/insert ↵	Tom Rondeau	2013-03-16	6	-0/+399
\| \| \| \| \| \| \| \| \| \| \| \|	to gr-blocks.
\| \| *	digital: fix QA tests for pmt import	Johnathan Corgan	2013-03-16	2	-2/+2
\| \| \|
\| \| *	Squash/rebased martin/ofdm-master onto trial merge branch	Martin Braun	2013-03-16	2	-0/+238
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-blocks/include/blocks/CMakeLists.txt
\| * \|	Merge branch 'ofdm-master' into ofdm-next	Johnathan Corgan	2013-03-15	3	-0/+265
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added fixups for next branch changes Conflicts: CMakeLists.txt gnuradio-core/src/lib/io/gr_message_sink.cc gnuradio-core/src/lib/io/gr_message_sink.h gnuradio-core/src/lib/io/gr_message_sink.i gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-core/src/lib/io/gr_message_source.h gnuradio-core/src/lib/io/gr_message_source.i gr-blocks/CMakeLists.txt gr-digital/CMakeLists.txt gr-digital/grc/digital_block_tree.xml gr-digital/include/digital/CMakeLists.txt gr-digital/include/digital_ofdm_cyclic_prefixer.h gr-digital/lib/CMakeLists.txt gr-digital/lib/digital_ofdm_cyclic_prefixer.cc gr-digital/lib/ofdm_cyclic_prefixer_impl.h gr-digital/python/CMakeLists.txt gr-digital/swig/CMakeLists.txt gr-digital/swig/digital_swig.i
\| \| * \|	digital: fix QA tests for pmt import	Johnathan Corgan	2013-03-15	2	-2/+2
\| \| \| \|
\| \| * \|	Squash/rebased martin/ofdm-master onto trial merge branch	Martin Braun	2013-03-15	2	-0/+238
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-blocks/include/blocks/CMakeLists.txt
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-13	1	-8/+8
\| \|\\|
\| \| *	blocks: fixing some UDP handling of ports/options; using gr-blocks blocks in QA.	Tom Rondeau	2013-03-13	1	-8/+8
\| \| \|
\| * \|	audio: minor master merge fix.	Tom Rondeau	2013-03-13	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	blocks: fix QA to turn off controlport (should generalize this).
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-13	1	-0/+121
\| \|\\|
\| \| *	blocks: udp_sink and udp_source implemented in gr-blocks using boost::asio ↵	Tom Rondeau	2013-03-13	1	-0/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of sockets. Needs testing on non-Linux OSes.
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-10	1	-0/+93
\| \|\\|
\| \| *	blocks: moved file sink and base and descriptor source/sink to gr-blocks.	Tom Rondeau	2013-03-10	1	-0/+93
\| \| \|
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-09	4	-1/+141
\| \|\\|
\| \| *	blocks: moved tagged_file_sink and wavfile source/sink/base to gr-blocks.	Tom Rondeau	2013-03-09	4	-1/+141
\| \| \|
\| * \|	Merge branch 'master' into next	Tom Rondeau	2013-03-08	1	-0/+59
\| \|\\|
\| \| *	blocks: moving vco/nco bases to gr-blocks.	Tom Rondeau	2013-03-08	1	-0/+59
\| \| \|
* \| \|	blocks: Updating testing environment.	Ben Reynwar	2013-03-11	40	-171/+151
\| \| \|
* \| \|	blocks: Enabling uninstalled python imports.	Ben Reynwar	2013-03-07	43	-1/+8
\|/ /
* \|	Merge branch 'master' into next	Tom Rondeau	2013-03-07	1	-2/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
\| *	core: moving over setting of max_messages option to conf.in file.	Tom Rondeau	2013-03-07	1	-2/+1
\| \| \| \| \| \| \| \|	blocks: these timers were actually doing much, so we can speed up the tests.
* \|	blocks: removing bin_statistics_f from core; now in gr-blocks.	Tom Rondeau	2013-03-07	1	-7/+6
\| \|
* \|	Merge branch 'master' into next	Tom Rondeau	2013-03-07	1	-15/+11
\|\\|
\| *	blocks: moving bin_statistics_f into gr-blocks.	Tom Rondeau	2013-03-07	1	-0/+227
\| \| \| \| \| \| \| \|	QA worked, but keeping disabled for now in reference to issue #199.