[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Sun, 8 May 2016 04:08:09 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 7b44e293a06d3dfebf426cd70bd7ea461d8ac84a
Merge: 2faf325 493a19e
Author: Johnathan Corgan <address@hidden>
Date: Sat May 7 21:05:33 2016 -0700
Merge branch 'next' into next-qt5
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(-)