[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: |
Wed, 5 Aug 2015 20:50:51 +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 eea639849bfe29b39c21ee2af6c1664da57067a8
Merge: 2ca8634 81f632c
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 5 13:42:17 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/lib/buffer.cc | 37 +-
gr-digital/lib/corr_est_cc_impl.cc | 21 +-
gr-fec/examples/ber_test.grc | 18 +-
gr-fec/examples/fecapi_async_decoders.grc | 1975 +++++++------
gr-fec/examples/fecapi_async_encoders.grc | 1521 +++++-----
gr-fec/examples/fecapi_async_to_stream.grc | 1929 +++++++------
gr-fec/examples/fecapi_encoders.grc | 14 +-
gr-fec/examples/fecapi_tagged_encoders.grc | 2537 +++++++++--------
gr-fec/include/gnuradio/fec/dummy_encoder.h | 15 +-
gr-filter/examples/channelizer_demo.grc | 1187 +++++---
gr-filter/examples/resampler_demo.grc | 903 +++---
gr-uhd/apps/uhd_fft | 15 +-
gr-uhd/examples/grc/uhd_dpsk_mod.grc | 3783 ++++++++++++++-----------
gr-uhd/examples/grc/uhd_fft.grc | 24 +-
gr-uhd/examples/grc/uhd_rx_dpsk.grc | 1411 +++++----
gr-uhd/examples/grc/uhd_two_tone_loopback.grc | 2623 +++++++++--------
gr-uhd/examples/grc/uhd_tx_dpsk.grc | 1329 +++++----
gr-uhd/examples/grc/uhd_wbfm_receive.grc | 1521 +++++-----
gr-zeromq/examples/zeromq_pubsub.grc | 691 ++---
gr-zeromq/examples/zeromq_pushpull.grc | 713 ++---
gr-zeromq/examples/zeromq_reqrep.grc | 707 ++---
gr-zeromq/examples/zmq_stream.grc | 1644 ++++++-----
22 files changed, 13690 insertions(+), 10928 deletions(-)