[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, 3 Apr 2015 19:59:37 +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 83bcd3df68e12862fe2750305925054631a5445c
Merge: a2376be 8939e2e
Author: Johnathan Corgan <address@hidden>
Date: Fri Apr 3 12:47:38 2015 -0700
Merge branch 'master' into next
Conflicts:
gr-atsc/include/gnuradio/atsc/field_sync_demux.h
CMakeLists.txt | 1 +
gnuradio-runtime/include/gnuradio/fxpt.h | 19 ++++++++++---------
gnuradio-runtime/include/gnuradio/fxpt_vco.h | 2 +-
gnuradio-runtime/lib/math/qa_fxpt.cc | 6 +++---
gr-analog/lib/frequency_modulator_fc_impl.cc | 2 +-
gr-audio/lib/alsa/alsa_sink.cc | 8 ++++----
gr-audio/lib/alsa/alsa_source.cc | 8 ++++----
gr-pager/lib/flex_parse_impl.cc | 4 ++--
gr-qtgui/CMakeLists.txt | 12 ++++++++++++
gr-qtgui/examples/CMakeLists.txt | 2 --
gr-qtgui/gr-qtgui.conf | 2 +-
gr-qtgui/grc/qtgui_range.xml | 5 +++--
gr-qtgui/python/qtgui/range.py | 16 ++++++++++------
gr-qtgui/{examples => themes}/alt.qss | 9 ++++++---
gr-qtgui/{examples => themes}/dark.qss | 0
15 files changed, 58 insertions(+), 38 deletions(-)