[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 20693b68b34a658513648baadde70cb2cc0b8712
Merge: 4eb84b1 d56ad00
Author: Tom Rondeau <address@hidden>
Date:   Fri Aug 29 16:20:03 2014 -0400

    Merge branch 'maint'

 gr-digital/examples/snr_estimators.py              | 71 +++++++++---------
 gr-digital/include/gnuradio/digital/mpsk_snr_est.h | 31 +++++---
 gr-digital/lib/mpsk_snr_est.cc                     | 84 ++++++++++++++--------
 gr-digital/python/digital/qa_mpsk_snr_est.py       | 27 ++++---
 4 files changed, 127 insertions(+), 86 deletions(-)