[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: |
Sat, 26 Apr 2014 22:34:13 +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 3a24506707635d9f2aed09bc8d50173dcbda2299
Merge: c57dd35 a337dcb
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 26 15:33:32 2014 -0700
Merge branch 'master' into next
gr-uhd/doc/uhd.dox | 5 +-
gr-uhd/examples/c++/tag_source_demo.h | 46 ++++-
gr-uhd/examples/c++/tags_demo.cc | 8 +-
gr-uhd/examples/python/freq_hopping.py | 216 +++++++++++++++++++++
gr-uhd/grc/gen_uhd_usrp_blocks.py | 29 ++-
gr-uhd/include/gnuradio/uhd/usrp_sink.h | 79 +++++---
gr-uhd/lib/usrp_sink_impl.cc | 321 +++++++++++++++++++++++++++-----
gr-uhd/lib/usrp_sink_impl.h | 30 ++-
8 files changed, 645 insertions(+), 89 deletions(-)