[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 3 Aug 2016 16:50:27 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 77f902e1a7d731805cfcd1a15d22d149898709b0
Merge: cfda705 124c641
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 3 09:45:31 2016 -0700
Merge branch 'master' into next
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(-)