[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: |
Sun, 8 Nov 2015 16:21:40 +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 3e5baa8bb3c0dceec058d691ea32e6b64cd1fff5
Merge: 15e3d39 51c0426
Author: Johnathan Corgan <address@hidden>
Date: Sun Nov 8 08:11:45 2015 -0800
Merge branch 'master' into next
gr-analog/grc/analog_quadrature_demod_cf.xml | 27 ++++++++++++++++++++
.../include/gnuradio/analog/quadrature_demod_cf.h | 29 ++++++++++++++++++++--
gr-dtv/lib/dvbt/dvbt_configure.cc | 2 +-
gr-qtgui/CMakeLists.txt | 1 +
gr-qtgui/lib/FrequencyDisplayPlot.cc | 8 +++---
gr-qtgui/themes/plain.qss | 3 +++
6 files changed, 63 insertions(+), 7 deletions(-)