commit-gnuradio
[Top][All Lists]
Advanced

[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: Thu, 28 Jul 2016 21:44:00 +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 85012bb73b8ad452262d5bd6e4af08fcb137144a
Merge: 38be5bc 7d09110
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jul 28 14:35:53 2016 -0700

    Merge branch 'master' into next

 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                   |  2 +-
 grc/core/generator/Generator.py                      |  3 ++-
 grc/gui/ActionHandler.py                             | 13 +++++--------
 grc/gui/BlockTreeWindow.py                           |  2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]