[Commit-gnuradio] [gnuradio] 12/15: 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 6113d99e32d810ae311f41fa2da5a6279ed70006
Merge: b4eb87f dec3bf5
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 10 07:10:26 2016 -0800

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

 grc/gui/ActionHandler.py   |  6 +++---
 grc/gui/Actions.py         |  2 +-
 grc/gui/BlockTreeWindow.py | 52 +++++++++++++++++++++++++++++++---------------
 grc/gui/Colors.py          |  3 ++-
 grc/gui/DrawingArea.py     | 27 +++++++++++++++++++-----
 grc/gui/FileDialogs.py     | 15 +++++++++++++
 grc/gui/Preferences.py     |  4 ++++
 grc/gui/PropsDialog.py     | 38 +++++++++++++++++++++++++++++++--
 grc/python/Block.py        |  7 +++++--
 grc/python/Platform.py     | 25 +++++++++++-----------
 grc/python/extract_docs.py |  2 +-
 11 files changed, 137 insertions(+), 44 deletions(-)