diff options
author | Ken Moore <ken@pcbsd.org> | 2014-10-14 16:04:04 -0400 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2014-10-14 16:04:04 -0400 |
commit | cbadbfe43ee63a09a4f915b055affe5b7b86c7ad (patch) | |
tree | 2526828e112c2b7cb83fbaa96b9d980242c866b0 /lumina-config/ColorDialog.ui | |
parent | Finish up the rest of the new Lumina Theme engine and the utilities for editi... (diff) | |
parent | Merge pull request #19 from Nanolx/master (diff) | |
download | lumina-cbadbfe43ee63a09a4f915b055affe5b7b86c7ad.tar.gz lumina-cbadbfe43ee63a09a4f915b055affe5b7b86c7ad.tar.bz2 lumina-cbadbfe43ee63a09a4f915b055affe5b7b86c7ad.zip |
Merge branch 'master' of github.com:pcbsd/lumina
Conflicts:
lumina-screenshot/MainUI.cpp
Diffstat (limited to 'lumina-config/ColorDialog.ui')
0 files changed, 0 insertions, 0 deletions