[Commit-gnuradio] [gnuradio] branch master updated (28f69a5 -> d5cea6e)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  28f69a5   Merge branch 'maint'
       new  060afcd   completing the half sentence about when to use C++
       new  c7d9bd3   qtgui: fixed issue #801 with controlpanel in the 
frequency display.
       new  30d2f0d   Merge remote-tracking branch 'tom/qtgui/cpfix' into maint
       new  f17cf02   Merge branch 'maint'
       new  e34e1b1   made the controlport CMakeLists use thrift includedirs
       new  8e1e920   Merge remote-tracking branch 
'mmueller/ctrlport_thrift_include_directories'
       new  39143b6   grc: fix generate mode error message (#800)
       new  cb3f3c6   grc: fix context menu in props dialog text displays
       new  3bff8fa   Merge remote-tracking branch 
'gnuradio-wg-grc/maint_grcwg' into maint
       new  c2fe4ec   Merge branch 'maint'
       new  2d6a957   grc: changing type colors.
       new  d5cea6e   Merge remote-tracking branch 
'gnuradio-wg-grc/master_grcwg'

The 12 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:
 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(-)