[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'mmueller/gnuradio-config-info_add_enabled_components'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 34c3136a8211557ad246fbe6a033988143d9b47f
Merge: 0bea2cc ae7fe68
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 21 09:46:29 2015 -0800

    Merge remote-tracking branch 
'mmueller/gnuradio-config-info_add_enabled_components'

 CMakeLists.txt                                |  7 +++++++
 gnuradio-runtime/apps/gnuradio-config-info.cc | 24 +++++++++++++++---------
 gnuradio-runtime/include/gnuradio/constants.h |  5 +++++
 gnuradio-runtime/lib/CMakeLists.txt           |  1 +
 gnuradio-runtime/lib/constants.cc.in          |  5 +++++
 5 files changed, 33 insertions(+), 9 deletions(-)