[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: |
Thu, 9 Jan 2014 21:52:54 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit f3abc0c710567bc2000616729f7238304d1c158a
Merge: f0a72d7 cbd21fc
Author: Tom Rondeau <address@hidden>
Date: Thu Jan 9 16:36:11 2014 -0500
Merge branch 'master' into next
cmake/Modules/FindICE.cmake | 12 +++++
gnuradio-runtime/lib/thread/thread.cc | 3 +-
.../include/gnuradio/analog/fastnoise_source_X.h.t | 4 +-
.../include/gnuradio/analog/noise_source_X.h.t | 2 +-
gr-filter/lib/interp_fir_filter_XXX_impl.cc.t | 2 +-
.../lib/rational_resampler_base_XXX_impl.cc.t | 2 +-
gr-filter/python/filter/qa_interp_fir_filter.py | 2 +-
gr-filter/python/filter/qa_rational_resampler.py | 4 +-
gr-qtgui/grc/qtgui_check_box.xml | 2 +-
gr-qtgui/grc/qtgui_chooser.xml | 13 +++--
gr-qtgui/grc/qtgui_entry.xml | 2 +-
gr-qtgui/grc/qtgui_label.xml | 2 +-
gr-qtgui/grc/qtgui_range.xml | 29 +++++++---
grc/python/convert_hier.py | 10 +++-
volk/lib/CMakeLists.txt | 62 ++++++++++++++++------
volk/tmpl/volk_cpu.tmpl.c | 2 +-
16 files changed, 112 insertions(+), 41 deletions(-)