[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: |
Thu, 12 Jan 2017 20:33:16 +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 e70db91c1621ff3673323a6514fd646575b11e43
Merge: 8d80d0a 6225e5d
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 12 12:21:17 2017 -0800
Merge branch 'master' into next
gnuradio-runtime/lib/hier_block2_detail.cc | 22 ++++++++------------
gnuradio-runtime/python/pmt/pmt_to_python.py | 2 +-
gnuradio-runtime/swig/tags.i | 1 +
gr-blocks/grc/blocks_message_strobe_random.xml | 2 +-
gr-blocks/grc/blocks_udp_sink.xml | 3 +--
gr-blocks/grc/blocks_udp_source.xml | 3 +--
.../gnuradio/digital/clock_recovery_mm_cc.h | 24 ++++++++++++++++++++++
.../gnuradio/digital/clock_recovery_mm_ff.h | 24 ++++++++++++++++++++++
gr-qtgui/grc/qtgui_time_sink_x.xml | 16 +++++++--------
gr-qtgui/lib/const_sink_c_impl.cc | 5 ++---
10 files changed, 72 insertions(+), 30 deletions(-)