[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 Jun 2014 22:44:34 +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 2bbba71273c2dd75abf58f96cb349304adc2833c
Merge: 2f3e800 80ec147
Author: Johnathan Corgan <address@hidden>
Date: Fri Jun 13 15:06:36 2014 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 4 +++
gnuradio-runtime/lib/flowgraph.cc | 8 ++++-
gnuradio-runtime/lib/pmt/generate_unv.py | 1 +
gnuradio-runtime/lib/pmt/pmt_int.h | 1 +
gnuradio-runtime/lib/pmt/pmt_io.cc | 13 +++++--
gnuradio-runtime/lib/pmt/unv_template.cc.t | 6 ++++
gnuradio-runtime/lib/pmt/unv_template.h.t | 1 +
.../grc/blocks_interleaved_short_to_complex.xml | 18 +++++++++-
.../gnuradio/blocks/interleaved_short_to_complex.h | 4 ++-
gr-blocks/lib/interleaved_short_to_complex_impl.cc | 22 +++++++++---
gr-blocks/lib/interleaved_short_to_complex_impl.h | 5 ++-
gr-pager/lib/flex_modes.cc | 2 +-
grc/gui/ActionHandler.py | 10 +++++-
grc/gui/Actions.py | 9 +++++
grc/gui/Bars.py | 4 +++
grc/gui/Dialogs.py | 42 ++++++++++++++++++++++
grc/gui/MainWindow.py | 1 -
grc/gui/Preferences.py | 6 ++++
grc/python/FlowGraph.py | 17 +++++++++
grc/python/flow_graph.tmpl | 8 ++---
20 files changed, 163 insertions(+), 19 deletions(-)