[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: |
Wed, 11 May 2016 17:41: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 1b3e19189daeef3555267dd8f90e8516259797e3
Merge: 7b44e29 02b6805
Author: Johnathan Corgan <address@hidden>
Date: Wed May 11 10:34:40 2016 -0700
Merge branch 'next' into next-qt5
gnuradio-runtime/apps/gnuradio-config-info.cc | 10 ++++++
gnuradio-runtime/examples/mp-sched/affinity_set.py | 8 ++---
gnuradio-runtime/examples/mp-sched/plot_flops.py | 15 ++++-----
.../examples/mp-sched/run_synthetic.py | 39 ++++++++++------------
gnuradio-runtime/include/gnuradio/sys_paths.h | 3 ++
gnuradio-runtime/lib/prefs.cc | 13 +++-----
gnuradio-runtime/lib/sys_paths.cc | 9 +++++
gr-audio/lib/alsa/gr-audio-alsa.conf | 6 ++--
gr-audio/lib/oss/gr-audio-oss.conf | 3 +-
gr-uhd/lib/usrp_source_impl.cc | 9 +++++
gr-uhd/lib/usrp_source_impl.h | 1 +
gr-utils/python/utils/grcc | 25 ++++++--------
grc/blocks/options.xml | 4 +--
grc/blocks/pad_sink.xml | 5 +++
grc/blocks/pad_source.xml | 5 +++
grc/blocks/parameter.xml | 4 ++-
grc/core/Constants.py | 11 +++---
grc/core/generator/flow_graph.tmpl | 12 +++----
grc/main.py | 12 +++----
19 files changed, 115 insertions(+), 79 deletions(-)