[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: |
Mon, 27 Jan 2014 20:10:39 +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 6f07f72689725a2080c956541868f96b1dc73205
Merge: 6abf96c 8211786
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 27 11:33:54 2014 -0800
Merge branch 'master' into next
cmake/Modules/FindQwt.cmake | 4 +-
docs/doxygen/other/group_defs.dox | 2 +-
docs/sphinx/source/blocks/networking_tools_blk.rst | 4 +-
gr-trellis/examples/python/README | 2 +-
gr-uhd/lib/usrp_source_impl.cc | 10 +-
gr-uhd/lib/usrp_source_impl.h | 5 +-
grc/base/ParseXML.py | 33 ++++--
grc/base/Platform.py | 113 ++++++++++++---------
grc/gui/ActionHandler.py | 18 +++-
grc/gui/Actions.py | 7 +-
grc/gui/Bars.py | 1 +
grc/gui/CMakeLists.txt | 1 +
grc/gui/MainWindow.py | 6 +-
grc/gui/Messages.py | 6 ++
grc/gui/ParserErrorsDialog.py | 100 ++++++++++++++++++
15 files changed, 240 insertions(+), 72 deletions(-)