[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: |
Tue, 1 Sep 2015 10:14:12 +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 15ae9d779efa12e7c8a495d87c42032b82942796
Merge: ab6459e 7d1ead9
Author: Johnathan Corgan <address@hidden>
Date: Tue Sep 1 03:01:54 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/logger.h.in | 2 +
gr-utils/python/modtool/templates.py | 148 +++++++++++++-------------
grc/base/FlowGraph.py | 55 ----------
grc/blocks/options.xml | 6 --
4 files changed, 76 insertions(+), 135 deletions(-)