[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 2 Jul 2014 22:12:43 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit d8b5bb5f20a678df4a28748beb40e60710a62b93
Merge: 877c507 d1c13af
Author: Tom Rondeau <address@hidden>
Date: Wed Jul 2 18:11:30 2014 -0400
Merge branch 'master' into next
docs/exploring-gnuradio/fm_rx.grc | 12 +++++------
docs/exploring-gnuradio/fm_tx.grc | 8 +++----
gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc | 2 +-
.../examples/metadata/file_metadata_source.grc | 2 +-
gr-channels/examples/channel_tone_response.grc | 4 ++--
gr-channels/examples/demo_gmsk.grc | 4 ++--
gr-channels/examples/demo_ofdm.grc | 4 ++--
gr-channels/examples/demo_qam.grc | 4 ++--
gr-channels/examples/demo_quantization.grc | 4 ++--
gr-digital/examples/demod/gfsk_loopback.grc | 4 ++--
gr-digital/examples/demod/gmsk_loopback.grc | 4 ++--
gr-digital/examples/demod/mpsk_demod.grc | 4 ++--
gr-digital/examples/demod/test_corr_and_sync.grc | 8 +++----
gr-digital/examples/demod/uhd_corr_and_sync_rx.grc | 6 +++---
.../python/digital/constellation_map_generator.py | 14 ++++++------
gr-digital/python/digital/psk_constellations.py | 25 +++++++++++-----------
gr-digital/python/digital/qam_constellations.py | 24 ++++++++++-----------
gr-fec/examples/fecapi_async_decoders.grc | 4 ++--
gr-fec/examples/fecapi_async_packed_decoders.grc | 2 +-
gr-fec/examples/fecapi_async_to_stream.grc | 4 ++--
gr-fec/examples/fecapi_decoders.grc | 2 +-
gr-fec/examples/fecapi_encoders.grc | 4 ++--
gr-fec/examples/fecapi_tagged_decoders.grc | 2 +-
gr-fec/examples/fecapi_tagged_encoders.grc | 8 +++----
gr-filter/examples/channelizer_demo.grc | 8 +++----
gr-qtgui/examples/qtgui_tags_viewing.grc | 8 +++----
gr-qtgui/grc/qtgui_const_sink_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_freq_sink_x.xml | 4 +++-
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 4 +++-
gr-qtgui/grc/qtgui_sink_x.xml | 3 ++-
gr-qtgui/grc/qtgui_time_raster_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_time_sink_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 5 ++++-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 ++
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 4 +++-
gr-qtgui/lib/FrequencyDisplayPlot.cc | 4 ++--
gr-qtgui/lib/const_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/freq_sink_c_impl.cc | 15 +++++++++++++
gr-qtgui/lib/freq_sink_c_impl.h | 2 ++
gr-qtgui/lib/freq_sink_f_impl.cc | 15 +++++++++++++
gr-qtgui/lib/freq_sink_f_impl.h | 2 ++
gr-qtgui/lib/freqdisplayform.cc | 23 ++++++++++++++++++--
gr-qtgui/lib/histogram_sink_f_impl.cc | 3 +++
gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +++
gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +++
gr-qtgui/lib/time_sink_c_impl.cc | 3 +++
gr-qtgui/lib/time_sink_f_impl.cc | 3 +++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 3 +++
gr-qtgui/lib/waterfall_sink_f_impl.cc | 3 +++
50 files changed, 201 insertions(+), 99 deletions(-)