[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: |
Tue, 15 Apr 2014 23:55:54 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit e25cc58b6155137325397e4d14db09331ea615e2
Merge: 4d93231 24b9e5b
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 15 16:54:53 2014 -0700
Merge branch 'master' into next
gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h | 9 +++++++++
gr-blocks/include/gnuradio/blocks/short_to_char.h | 6 ++++++
gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h | 8 ++++++++
gr-blocks/lib/socket_pdu_impl.cc | 8 ++++++--
gr-digital/grc/digital_constellation_modulator.xml | 2 +-
gr-digital/grc/digital_dxpsk_demod.xml | 2 +-
gr-digital/grc/digital_dxpsk_mod.xml | 2 +-
gr-digital/grc/digital_gfsk_demod.xml | 2 +-
gr-digital/grc/digital_gfsk_mod.xml | 2 +-
gr-digital/grc/digital_gmsk_demod.xml | 2 +-
gr-digital/grc/digital_gmsk_mod.xml | 2 +-
gr-digital/grc/digital_psk_demod.xml | 2 +-
gr-digital/grc/digital_psk_mod.xml | 2 +-
gr-digital/grc/digital_qam_demod.xml | 2 +-
gr-digital/grc/digital_qam_mod.xml | 2 +-
gr-digital/python/digital/gmsk.py | 6 +++---
gr-digital/python/digital/packet_utils.py | 2 ++
gr-digital/python/digital/psk.py | 18 +++++++++++++-----
gr-uhd/python/uhd/qa_uhd.py | 8 ++++++++
gr-uhd/swig/uhd_swig.i | 15 +++++++++++++++
grc/base/Platform.py | 1 +
grc/grc_gnuradio/blks2/packet.py | 2 +-
grc/gui/ActionHandler.py | 4 +++-
grc/gui/Actions.py | 6 ++++++
grc/gui/Bars.py | 1 +
grc/gui/FlowGraph.py | 11 ++++++++++-
grc/gui/Messages.py | 11 ++++++++++-
grc/gui/Platform.py | 7 ++++++-
grc/gui/Preferences.py | 5 ++---
grc/python/Constants.py | 5 ++++-
grc/python/Platform.py | 15 +++++++++++----
31 files changed, 136 insertions(+), 34 deletions(-)