[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, 19 Sep 2014 19:08:00 +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 1a9a5502db4dac4995f372db2ce9ff0c7094e7b0
Merge: 3c93a4d 6e12074
Author: Johnathan Corgan <address@hidden>
Date: Fri Sep 19 12:05:01 2014 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/buffer.h | 10 +-
gnuradio-runtime/include/pmt/pmt.h | 10 ++
gnuradio-runtime/lib/buffer.cc | 59 +++-----
gnuradio-runtime/lib/pmt/pmt.cc | 12 ++
gnuradio-runtime/lib/pmt/qa_pmt_prims.cc | 9 ++
gnuradio-runtime/python/pmt/qa_pmt.py | 2 +
gnuradio-runtime/swig/pmt_swig.i | 2 +
gr-blocks/grc/blocks_abs_xx.xml | 19 ++-
gr-blocks/grc/blocks_tagged_stream_to_pdu.xml | 1 +
gr-blocks/grc/blocks_vector_source_x.xml | 1 +
gr-blocks/include/gnuradio/blocks/abs_XX.h.t | 2 +-
gr-blocks/lib/abs_XX_impl.cc.t | 13 +-
gr-blocks/lib/abs_XX_impl.h.t | 5 +-
gr-blocks/lib/qa_block_tags.cc | 198 ++++++++++++++------------
volk/apps/volk_profile.cc | 61 +++++++-
volk/lib/CMakeLists.txt | 7 +-
volk/lib/qa_utils.cc | 32 +++--
volk/lib/qa_utils.h | 43 +++++-
18 files changed, 316 insertions(+), 170 deletions(-)