[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'gnuradio-wg-grc/grc_xml_error_dialog'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fa32b7b02c7c01a8f04590b347040c3937199c7e
Merge: 3fa56a4 1c3b518
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 27 10:06:39 2014 -0800

    Merge remote-tracking branch 'gnuradio-wg-grc/grc_xml_error_dialog'

 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/Messages.py           |   6 +++
 grc/gui/ParserErrorsDialog.py | 100 +++++++++++++++++++++++++++++++++++++
 8 files changed, 221 insertions(+), 58 deletions(-)