[Commit-gnuradio] [gnuradio] 10/11: Merge remote-tracking branch 'gnuradio-wg-grc/grc_scroll_fix'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4968fafc4593e1525902cb10c8349fc3a3723aec
Merge: d2b51d8 04de4b8
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 13 15:01:25 2014 -0700

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

 grc/gui/ActionHandler.py | 10 +++++++++-
 grc/gui/Actions.py       |  9 +++++++++
 grc/gui/Bars.py          |  4 ++++
 grc/gui/Dialogs.py       | 42 ++++++++++++++++++++++++++++++++++++++++++
 grc/gui/MainWindow.py    |  1 -
 grc/gui/Preferences.py   |  6 ++++++
 6 files changed, 70 insertions(+), 2 deletions(-)