[Commit-gnuradio] [gnuradio] 19/20: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e1bdd3c8eff488aa5de91cd1a8b474779b7054d7
Merge: 5e64507 26b6cf4
Author: Johnathan Corgan <address@hidden>
Date:   Fri Aug 28 12:06:07 2015 -0700

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

 grc/CMakeLists.txt       | 17 +++++----
 grc/gui/ActionHandler.py | 30 +++++++++-------
 grc/gui/Actions.py       |  7 ++--
 grc/gui/Dialogs.py       | 31 ++++++++++++++---
 grc/gui/Messages.py      |  2 +-
 grc/gui/Preferences.py   | 91 ++++++++++++++++++++++++------------------------
 grc/python/Constants.py  | 25 +++++++------
 grc/python/Generator.py  |  1 +
 grc/python/Platform.py   | 37 +++++++++++++++-----
 9 files changed, 145 insertions(+), 96 deletions(-)