[Commit-gnuradio] [gnuradio] 14/18: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6fed8f82386e3157018f6498aee648d9aa87de76
Merge: 86d551e bf6d4e2
Author: Johnathan Corgan <address@hidden>
Date:   Mon Dec 7 15:38:59 2015 -0800

    Merge branch 'maint'

 grc/gui/Actions.py | 2 +-
 grc/gui/Block.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc grc/gui/Actions.py
index 1322dca,692b9d1..9b32b3e
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@@ -442,14 -422,9 +442,14 @@@ BUSSIFY_SINKS = Action
  )
  XML_PARSER_ERRORS_DISPLAY = Action(
      label='_Parser Errors',
-     tooltip='View errors that occured while parsing XML files',
+     tooltip='View errors that occurred while parsing XML files',
      stock_id=gtk.STOCK_DIALOG_ERROR,
  )
 +FLOW_GRAPH_OPEN_QSS_THEME = Action(
 +    label='Set Default QT GUI _Theme',
 +    tooltip='Set a default QT Style Sheet file to use for QT GUI',
 +    stock_id=gtk.STOCK_OPEN,
 +)
  TOOLS_RUN_FDESIGN = Action(
      label='Filter Design Tool',
      tooltip='Execute gr_filter_design',