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

@ -2,7 +2,7 @@
Name=multimc
Comment=MultiMC Default Icons
Inherits=default
Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48
Directories=scalable/apps,8x8,16x16,22x22,24x24,32x32,48x48,scalable
[scalable/apps]
Size=48
@ -30,4 +30,10 @@ Size=32
Size=48
[64x64]
Size=64
Size=64
[scalable]
Size=48
Type=Scalable
MinSize=16
MaxSize=256