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

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6c2851d14fa52df126b9164998f8c7f7831e0f68
Merge: 6aa995a 8bb7a5b
Author: Johnathan Corgan <address@hidden>
Date:   Sat May 7 12:00:18 2016 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/vmcircbuf_prefs.cc            | 19 ++++++++++---------
 gr-digital/include/gnuradio/digital/mpsk_snr_est.h |  8 ++++----
 gr-fft/lib/fft.cc                                  | 16 ++++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)