[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, 29 Aug 2014 20:50:40 +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 e780231253fc20ee83713fab587e65f72646a776
Merge: 40dcfe6 01c3923
Author: Tom Rondeau <address@hidden>
Date: Fri Aug 29 16:50:25 2014 -0400
Merge branch 'master' into next
gr-digital/examples/snr_estimators.py | 71 +++++++++---------
gr-digital/grc/digital_probe_mpsk_snr_est_c.xml | 15 ++++
gr-digital/include/gnuradio/digital/mpsk_snr_est.h | 31 +++++---
.../gnuradio/digital/probe_mpsk_snr_est_c.h | 28 ++++++--
gr-digital/lib/mpsk_snr_est.cc | 84 ++++++++++++++--------
gr-digital/lib/probe_mpsk_snr_est_c_impl.cc | 50 +++++++++++--
gr-digital/lib/probe_mpsk_snr_est_c_impl.h | 20 ++++--
gr-digital/python/digital/qa_mpsk_snr_est.py | 27 ++++---
8 files changed, 221 insertions(+), 105 deletions(-)