[Commit-gnuradio] [gnuradio] 09/15: Merge branch 'maint_grcwg' into docstring_gui_fixes

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e21a3dad6cf8e035ff5104d9eddfce11a8582658
Merge: 857540a 1025df0
Author: Sebastian Koslowski <address@hidden>
Date:   Fri Feb 5 11:51:20 2016 +0100

    Merge branch 'maint_grcwg' into docstring_gui_fixes

 grc/base/FlowGraph.py      | 163 ++++++++++++++++++++++-----------------------
 grc/gui/BlockTreeWindow.py |  28 ++++----
 2 files changed, 92 insertions(+), 99 deletions(-)