[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'skoslowski/hier_block2_fixes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 67a9f874e6bbd8f1fbf849fd2e5573b719610a56
Merge: c545ddf 3a3bfd2
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 30 14:52:46 2014 -0800

    Merge remote-tracking branch 'skoslowski/hier_block2_fixes'
    
    Conflicts:
        gr-wxgui/python/wxgui/common.py

 gr-wxgui/python/wxgui/common.py  | 441 ++++++++++++++++++++-------------------
 grc/grc_gnuradio/blks2/packet.py |   8 +-
 2 files changed, 230 insertions(+), 219 deletions(-)