[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: |
Fri, 13 Mar 2015 14:07:24 +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 919a0e8fb8de69f4688f282a917bbdc60c749e23
Merge: add7609 5fd8738
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 13 10:04:13 2015 -0400
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 3 ++-
gr-analog/grc/analog_nbfm_rx.xml | 2 +-
gr-analog/grc/analog_nbfm_tx.xml | 2 +-
gr-analog/grc/analog_wfm_tx.xml | 2 +-
.../include/gnuradio/blocks/multiply_matrix_XX.h.t | 3 +--
gr-blocks/include/gnuradio/blocks/udp_source.h | 4 ++--
gr-blocks/lib/multiply_matrix_cc_impl.cc | 3 +++
gr-blocks/lib/multiply_matrix_ff_impl.cc | 3 +++
gr-blocks/lib/udp_source_impl.cc | 25 ++++++++++++----------
gr-blocks/lib/udp_source_impl.h | 2 ++
gr-zeromq/include/gnuradio/zeromq/pub_sink.h | 10 +++++----
gr-zeromq/include/gnuradio/zeromq/pull_source.h | 11 +++++-----
gr-zeromq/include/gnuradio/zeromq/push_sink.h | 11 +++++-----
gr-zeromq/include/gnuradio/zeromq/rep_sink.h | 11 +++++-----
gr-zeromq/include/gnuradio/zeromq/req_source.h | 12 +++++------
gr-zeromq/include/gnuradio/zeromq/sub_source.h | 11 +++++-----
16 files changed, 66 insertions(+), 49 deletions(-)