[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 3579cf2ab67b8d55ac23702c2893cc2c382469b7
Merge: 00005bd d5cea6e
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 22 07:25:37 2015 -0700

    Merge branch 'master' into next

 README.hacking                                  | 11 ++---
 gnuradio-runtime/lib/controlport/CMakeLists.txt |  1 +
 gr-qtgui/lib/freqcontrolpanel.cc                |  3 +-
 grc/gui/Dialogs.py                              | 18 +++++--
 grc/gui/PropsDialog.py                          |  6 +--
 grc/python/Block.py                             |  3 +-
 grc/python/Constants.py                         | 66 +++++++++++++++++--------
 7 files changed, 72 insertions(+), 36 deletions(-)