[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 124c641c12c091368bf79c6fa612eded9de8e2f4
Merge: a6e3db2 b18c00c
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 3 09:45:14 2016 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

 grc/core/Config.py    | 13 ++++++++++++-
 grc/core/Constants.py |  1 +
 grc/core/Platform.py  |  9 +++------
 grc/grc.conf.in       |  1 +
 4 files changed, 17 insertions(+), 7 deletions(-)