[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'mmueller/gr-conf-info-add-config-queries'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 692bfa11a4d1eba9551127421678dd1346e16537
Merge: e5fb266 2c81220
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 11 10:16:29 2016 -0700

    Merge remote-tracking branch 'mmueller/gr-conf-info-add-config-queries'

 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 +++++++++
 4 files changed, 27 insertions(+), 8 deletions(-)