[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: |
Mon, 31 Mar 2014 20:15: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 0d6f848676b5d575bea79a16a03b141b1e3de22c
Merge: c8d54be 7390c25
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 31 13:06:11 2014 -0700
Merge branch 'master' into next
cmake/Modules/FindQwt.cmake | 4 +-
gnuradio-runtime/lib/pmt/pmt.cc | 3 +-
gnuradio-runtime/python/pmt/pmt_to_python.py | 41 ++++-
gr-blocks/grc/blocks_socket_pdu.xml | 28 +++-
gr-blocks/grc/blocks_throttle.xml | 1 +
gr-blocks/include/gnuradio/blocks/socket_pdu.h | 3 +-
gr-blocks/lib/socket_pdu_impl.cc | 136 +++++++++------
gr-blocks/lib/socket_pdu_impl.h | 5 +-
gr-blocks/lib/tcp_connection.cc | 50 ++++--
gr-blocks/lib/tcp_connection.h | 8 +-
gr-digital/grc/digital_hdlc_deframer_bp.xml | 33 ++++
gr-digital/grc/digital_hdlc_framer_pb.xml | 21 +++
gr-digital/grc/digital_header_payload_demux.xml | 5 +
gr-digital/include/gnuradio/digital/CMakeLists.txt | 2 +
.../include/gnuradio/digital/hdlc_deframer_bp.h | 62 +++++++
.../include/gnuradio/digital/hdlc_framer_pb.h | 65 ++++++++
gr-digital/lib/CMakeLists.txt | 2 +
gr-digital/lib/hdlc_deframer_bp_impl.cc | 160 ++++++++++++++++++
gr-digital/lib/hdlc_deframer_bp_impl.h | 54 ++++++
gr-digital/lib/hdlc_framer_pb_impl.cc | 184 +++++++++++++++++++++
gr-digital/lib/hdlc_framer_pb_impl.h | 55 ++++++
gr-digital/python/digital/qa_hdlc_framer.py | 64 +++++++
gr-digital/swig/digital_swig.i | 6 +
23 files changed, 899 insertions(+), 93 deletions(-)