[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'maint' |
|
Date: |
Mon, 25 Apr 2016 22:56:28 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit ece754f1716b7378162b54b09b2a88e53e538d12
Merge: 873b86c 4aa9404
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 25 15:44:52 2016 -0700
Merge branch 'maint'
gnuradio-runtime/gr_log_default.conf | 21 ---------------------
gr-blocks/lib/udp_sink_impl.cc | 2 +-
gr-blocks/lib/udp_source_impl.cc | 2 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 2 +-
gr-uhd/grc/gen_uhd_usrp_blocks.py | 2 +-
8 files changed, 7 insertions(+), 28 deletions(-)