[Commit-gnuradio] [gnuradio] 05/06: 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 a166f439d9c33165ccc0a3fee3d63cdef2040d5a
Merge: 029079c 1edeff1
Author: Johnathan Corgan <address@hidden>
Date:   Wed Oct 1 12:27:08 2014 -0700

    Merge branch 'maint'

 grc/base/ParseXML.py       |  2 +-
 grc/base/Port.py           | 15 +++++++++++----
 grc/gui/ActionHandler.py   |  8 ++++++--
 grc/gui/Block.py           |  3 +--
 grc/gui/BlockTreeWindow.py | 11 +++++++----
 grc/gui/MainWindow.py      | 12 ++++++------
 grc/gui/Port.py            | 24 +++++++++++++++---------
 grc/python/Generator.py    |  6 +++---
 8 files changed, 50 insertions(+), 31 deletions(-)