[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Fri, 11 Dec 2015 20:27:03 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 6903755970ee8f3e3b42480fa7853ecda67d876c
Merge: 85fdc19 bb954cd
Author: Johnathan Corgan <address@hidden>
Date: Fri Dec 11 12:19:32 2015 -0800
Merge branch 'next' into next-qt5
gnuradio-runtime/include/gnuradio/py_feval.h | 1 +
gnuradio-runtime/include/gnuradio/sys_pri.h | 10 ++--
.../lib/controlport/thrift/gnuradio.thrift | 2 +-
gr-digital/grc/digital_corr_est_cc.xml | 2 +-
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 2 -
gr-vocoder/gnuradio-vocoder.pc.in | 2 +-
gr-vocoder/include/gnuradio/vocoder/codec2.h | 2 +-
gr-vocoder/lib/CMakeLists.txt | 7 +++
gr-vocoder/swig/CMakeLists.txt | 1 +
grc/gui/ActionHandler.py | 6 +--
grc/gui/Bars.py | 2 +-
grc/gui/MainWindow.py | 2 +-
grc/gui/Preferences.py | 60 +++++++++++++---------
grc/gui/Utils.py | 33 +++++++-----
14 files changed, 80 insertions(+), 52 deletions(-)