Merge branch 'feature_theme_support' into develop

Conflicts:
	main.cpp
This commit is contained in:
Petr Mrázek
2014-06-30 22:22:09 +02:00
60 changed files with 2108 additions and 8 deletions

View File

@ -500,6 +500,8 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
<include location="../resources/pe_dark/pe_dark.qrc"/>
<include location="../resources/pe_light/pe_light.qrc"/>
<include location="../resources/multimc/multimc.qrc"/>
<include location="../resources/instances/instances.qrc"/>
</resources>