[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, 26 Apr 2016 22:38:22 +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 efbb415e5abeefe0cedf36f44e13362514fd4521
Merge: 595693c 8820340
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 26 15:36:19 2016 -0700
Merge branch 'master' into next
gr-uhd/grc/gen_uhd_usrp_blocks.py | 92 ++++++++++++++++++++++++++++-
gr-uhd/include/gnuradio/uhd/usrp_source.h | 77 ++++++++++++++++++++++++
gr-uhd/lib/usrp_block_impl.h | 5 ++
gr-uhd/lib/usrp_sink_impl.cc | 2 -
gr-uhd/lib/usrp_source_impl.cc | 98 +++++++++++++++++++++++++++++++
gr-uhd/lib/usrp_source_impl.h | 9 +++
gr-uhd/swig/uhd_swig.i | 6 ++
7 files changed, 286 insertions(+), 3 deletions(-)