[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next |
|
Date: |
Mon, 6 Jul 2015 23:37:02 +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 9c91a38f0dad9e0bacb96b87f6793c13522d00b2
Merge: 8ef1ea6 1185d40
Author: Johnathan Corgan <address@hidden>
Date: Mon Jul 6 16:05:42 2015 -0700
Merge branch 'master' into next
cmake/Modules/GnuradioConfig.cmake | 1 +
gnuradio-runtime/include/gnuradio/flowgraph.h | 76 +++++++++++++++++-----
gnuradio-runtime/python/gnuradio/CMakeLists.txt | 1 +
gnuradio-runtime/python/gnuradio/eng_arg.py | 53 +++++++++++++++
gr-analog/gnuradio-analog.pc.in | 2 +-
.../gnuradio/analog/frequency_modulator_fc.h | 2 +-
gr-analog/lib/frequency_modulator_fc_impl.cc | 4 +-
gr-analog/lib/frequency_modulator_fc_impl.h | 2 +-
gr-noaa/README | 13 ++--
grc/gui/BlockTreeWindow.py | 2 +-
grc/scripts/gnuradio-companion | 8 ++-
11 files changed, 134 insertions(+), 30 deletions(-)