[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'master' into next |
|
Date: |
Mon, 25 Apr 2016 22:56:29 +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 77679de8aca6a56f617f8a3f35af4a706369d88c
Merge: 677995d ece754f
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 25 15:52:44 2016 -0700
Merge branch 'master' into next
gnuradio-runtime/gr_log_default.conf | 21 ---------------------
gr-blocks/lib/udp_sink_impl.cc | 2 +-
gr-blocks/lib/udp_source_impl.cc | 2 +-
gr-uhd/grc/gen_uhd_usrp_blocks.py | 2 +-
grc/core/FlowGraph.py | 2 +-
grc/core/Platform.py | 2 ++
grc/gui/Bars.py | 4 ++--
7 files changed, 8 insertions(+), 27 deletions(-)