[Commit-gnuradio] [gnuradio] branch master updated (6431a11 -> d4bb541)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  6431a11   Merge remote-tracking branch 'drmpeg/dvb-s2x-fix'
       new  bc4e0b3   Backport GRC Python code for Python-2.6.6+
       new  015421b   Merge branch 'maint'
       new  ff8d4ab   grc: change default filepath to documents dir for windows 
only
       new  dc5a05d   grc: fix IndexError when consuming \b in console (#1043)
       new  16ffd0b   Merge remote-tracking branch 'skoslowski/issue1043' into 
maint
       new  d4bb541   Merge branch 'maint'

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 grc/core/Block.py             | 22 +++++++--------
 grc/core/Connection.py        | 10 +++----
 grc/core/Element.py           |  2 +-
 grc/core/FlowGraph.py         |  4 +--
 grc/core/Param.py             | 64 +++++++++++++++++++++----------------------
 grc/core/Platform.py          | 20 +++++++-------
 grc/core/Port.py              | 20 +++++++-------
 grc/core/utils/odict.py       |  4 +--
 grc/gui/Block.py              |  2 +-
 grc/gui/Constants.py          |  2 +-
 grc/gui/Dialogs.py            |  2 +-
 grc/gui/Executor.py           |  2 +-
 grc/gui/FlowGraph.py          |  2 +-
 grc/gui/ParserErrorsDialog.py |  2 +-
 grc/gui/PropsDialog.py        |  2 +-
 grc/gui/Utils.py              |  2 +-
 grc/gui/VariableEditor.py     |  2 +-
 grc/main.py                   |  0
 18 files changed, 82 insertions(+), 82 deletions(-)
 mode change 100755 => 100644 grc/main.py