[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, 7 Mar 2014 17:53:06 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit e953b7d6d2cc3adebd2de66e03073cd301c092b7
Merge: 6c8d0d2 f08f0f2
Author: Tom Rondeau <address@hidden>
Date: Fri Mar 7 12:52:05 2014 -0500
Merge branch 'master' into next
CMakeLists.txt | 2 +-
gnuradio-runtime/include/gnuradio/flowgraph.h | 6 +-
gnuradio-runtime/include/gnuradio/hier_block2.h | 7 +-
gnuradio-runtime/lib/flowgraph.cc | 33 +-
gnuradio-runtime/lib/hier_block2.cc | 7 +
gnuradio-runtime/python/gnuradio/gr/hier_block2.py | 6 +-
gnuradio-runtime/python/gnuradio/gr/top_block.py | 28 +-
gnuradio-runtime/swig/hier_block2.i | 2 +
gnuradio-runtime/swig/top_block.i | 9 +-
gr-analog/python/analog/fm_demod.py | 61 +-
gr-analog/python/analog/fm_emph.py | 24 +-
gr-digital/python/digital/bpsk.py | 47 +-
gr-digital/python/digital/qpsk.py | 48 +-
gr-fec/lib/reed-solomon/char.h | 1 +
gr-fec/lib/reed-solomon/encode_rs.c | 14 +
gr-fec/lib/reed-solomon/init_rs.c | 23 +
gr-vocoder/doc/vocoder.dox | 10 +
gr-vocoder/examples/loopback-codec2.grc | 1184 ++++++++++++++++++++
gr-vocoder/examples/loopback-gsmfr.grc | 1078 ++++++++++++++++++
gr-vocoder/grc/vocoder_codec2_decode_ps.xml | 1 +
gr-vocoder/grc/vocoder_codec2_encode_sp.xml | 2 +-
gr-vocoder/grc/vocoder_gsm_fr_decode_ps.xml | 1 +
gr-vocoder/grc/vocoder_gsm_fr_encode_sp.xml | 1 +
.../include/gnuradio/vocoder/codec2_decode_ps.h | 10 +-
.../include/gnuradio/vocoder/codec2_encode_sp.h | 15 +-
.../include/gnuradio/vocoder/cvsd_decode_bs.h | 5 +-
.../include/gnuradio/vocoder/cvsd_encode_sb.h | 6 +-
.../include/gnuradio/vocoder/gsm_fr_decode_ps.h | 5 +-
.../include/gnuradio/vocoder/gsm_fr_encode_sp.h | 9 +-
gr-vocoder/lib/codec2/codec2.h | 1 +
gr-vocoder/lib/codec2_decode_ps_impl.cc | 23 +-
gr-vocoder/lib/codec2_decode_ps_impl.h | 7 +-
gr-vocoder/lib/codec2_encode_sp_impl.cc | 23 +-
gr-vocoder/lib/codec2_encode_sp_impl.h | 7 +-
gr-vocoder/lib/gsm_fr_encode_sp_impl.cc | 2 +-
gr-vocoder/python/vocoder/qa_codec2_vocoder.py | 4 +-
36 files changed, 2580 insertions(+), 132 deletions(-)