[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: |
Tue, 26 Apr 2016 22:29:22 +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 595693c1480f61125f6c4508ffac7ef8fa1a508c
Merge: 9234a66 71a7aeb
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 26 15:03:58 2016 -0700
Merge branch 'master' into next
gr-qtgui/doc/qtgui.dox | 48 ++
gr-qtgui/examples/CMakeLists.txt | 1 +
gr-qtgui/examples/test_qtgui_msg.grc | 978 +++++++++++++++++++++++++
gr-qtgui/grc/qtgui_block_tree.xml | 1 +
gr-qtgui/grc/qtgui_edit_box_msg.xml | 152 ++++
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 +
gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h | 151 ++++
gr-qtgui/include/gnuradio/qtgui/qtgui_types.h | 20 +-
gr-qtgui/lib/CMakeLists.txt | 2 +
gr-qtgui/lib/edit_box_msg_impl.cc | 571 +++++++++++++++
gr-qtgui/lib/edit_box_msg_impl.h | 93 +++
gr-qtgui/swig/qtgui_swig.i | 15 +
12 files changed, 2032 insertions(+), 1 deletion(-)