[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: |
Fri, 30 Jan 2015 00:34:25 +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 77862dd477ad445d77b90b2179c8c039c0263bdc
Merge: 27027e5 12972cb
Author: Johnathan Corgan <address@hidden>
Date: Thu Jan 29 16:29:43 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_probe_rate.xml | 5 +
gr-blocks/lib/probe_rate_impl.cc | 5 +
gr-uhd/examples/grc/.gitignore | 1 +
gr-uhd/examples/grc/uhd_normalized_gain.grc | 1104 +++++++++++++++++++++++++++
gr-uhd/grc/gen_uhd_usrp_blocks.py | 40 +-
gr-uhd/include/gnuradio/uhd/usrp_sink.h | 33 +-
gr-uhd/include/gnuradio/uhd/usrp_source.h | 33 +-
gr-uhd/lib/usrp_sink_impl.cc | 23 +
gr-uhd/lib/usrp_sink_impl.h | 2 +
gr-uhd/lib/usrp_source_impl.cc | 23 +
gr-uhd/lib/usrp_source_impl.h | 2 +
11 files changed, 1266 insertions(+), 5 deletions(-)