[Commit-gnuradio] [gnuradio] 07/08: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 53dc66140d29aff70ebcd12746e6ccf6bb17997c
Merge: 493a19e 2aec2ff
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 11 10:31:43 2016 -0700

    Merge branch 'master' into next

 gnuradio-runtime/apps/gnuradio-config-info.cc | 10 ++++++++++
 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 +
 grc/blocks/pad_sink.xml                       |  5 +++++
 grc/blocks/pad_source.xml                     |  5 +++++
 grc/core/Constants.py                         | 11 +++++++----
 11 files changed, 60 insertions(+), 15 deletions(-)