[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 785bfe82180b7494a9b23f7ef9ad3d2bf99499c0
Merge: d9b79b7 f60cd24
Author: Johnathan Corgan <address@hidden>
Date:   Thu Nov 6 11:32:20 2014 -0800

    Merge branch 'master' into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 gr-utils/python/utils/grcc | 29 +++++++++++++++++++----------
 grc/CMakeLists.txt         | 10 ++++++++++
 grc/grc.conf.in            |  2 +-
 grc/python/Port.py         |  3 ++-
 4 files changed, 32 insertions(+), 12 deletions(-)