[Commit-gnuradio] [gnuradio] 13/13: Merge remote-tracking branch 'tom/qtgui/themes_support'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8939e2e400b9ca2187c8618d986055bb0346ac07
Merge: 151756b 3689666
Author: Johnathan Corgan <address@hidden>
Date:   Fri Apr 3 12:42:52 2015 -0700

    Merge remote-tracking branch 'tom/qtgui/themes_support'

 CMakeLists.txt                         |  1 +
 gr-qtgui/CMakeLists.txt                | 12 ++++++++++++
 gr-qtgui/examples/CMakeLists.txt       |  2 --
 gr-qtgui/gr-qtgui.conf                 |  2 +-
 gr-qtgui/{examples => themes}/alt.qss  |  9 ++++++---
 gr-qtgui/{examples => themes}/dark.qss |  0
 6 files changed, 20 insertions(+), 6 deletions(-)