[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, 16 May 2014 23:49:31 +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 de2a634e63f8514929968ccd9e4fed1e3a2bd749
Merge: 027eae4 cb0bc7f
Author: Johnathan Corgan <address@hidden>
Date: Fri May 16 16:35:13 2014 -0700
Merge branch 'master' into next
cmake/Modules/FindPortaudio.cmake | 25 +++++++++++++++---
gnuradio-runtime/include/pmt/pmt.h | 3 +++
gnuradio-runtime/lib/pmt/pmt.cc | 10 ++++++++
gnuradio-runtime/lib/pmt/pmt_int.h | 1 +
gnuradio-runtime/lib/pmt/unv_template.h.t | 1 +
gnuradio-runtime/python/pmt/qa_pmt.py | 2 ++
gnuradio-runtime/swig/pmt_swig.i | 1 +
gr-blocks/grc/blocks_pdu_filter.xml | 16 +++++++++++-
gr-blocks/include/gnuradio/blocks/pdu_filter.h | 2 +-
gr-blocks/lib/pdu_filter_impl.cc | 30 ++++++++++------------
gr-blocks/lib/pdu_filter_impl.h | 3 ++-
gr-digital/lib/hdlc_deframer_bp_impl.cc | 6 +++--
.../python/modtool/gr-newmod/python/__init__.py | 6 ++++-
13 files changed, 80 insertions(+), 26 deletions(-)