[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnuradio-commit
Subject:    [Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
From:       git () gnuradio ! org
Date:       2016-07-28 21:44:01
Message-ID: 20160728214401.3069B1A8D1E () hertz ! gnuradio ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit 4c961d0964ec3a4de0dd5e600d9bb5b3ddf159ad
Merge: 67fbbe0 85012bb
Author: Johnathan Corgan <johnathan@corganlabs.com>
Date:   Thu Jul 28 14:36:09 2016 -0700

    Merge branch 'next' into next-qt5

 gr-analog/lib/fmdet_cf_impl.cc                       |  2 +-
 gr-blocks/include/gnuradio/blocks/stream_to_vector.h |  2 +-
 gr-fec/CMakeLists.txt                                |  1 +
 gr-fec/swig/CMakeLists.txt                           |  2 +-
 gr-qtgui/grc/qtgui_number_sink.xml.cmakein           |  2 +-
 grc/core/generator/Generator.py                      |  3 ++-
 grc/gui/ActionHandler.py                             | 13 +++++--------
 grc/gui/BlockTreeWindow.py                           |  2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)


_______________________________________________
Commit-gnuradio mailing list
Commit-gnuradio@gnu.org
https://lists.gnu.org/mailman/listinfo/commit-gnuradio
[prev in list] [next in list] [prev in thread] [next in thread]