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

[git]

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

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit de5f726fab5e1958a3ad6ade962d02f7cd4bcb95
Merge: bc86203 77f902e
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 3 09:46:04 2016 -0700

    Merge branch 'next' into next-qt5

 grc/checks.py                  | 80 -------------------------------------
 grc/core/Config.py             | 13 +++++-
 grc/core/Constants.py          |  1 +
 grc/core/Platform.py           |  9 ++---
 grc/grc.conf.in                |  1 +
 grc/scripts/gnuradio-companion | 91 +++++++++++++++++++++++++++++++++++-------
 6 files changed, 93 insertions(+), 102 deletions(-)