diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /multimc.qrc | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'multimc.qrc')
| -rw-r--r-- | multimc.qrc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/multimc.qrc b/multimc.qrc index cfcc9829..acd9efd2 100644 --- a/multimc.qrc +++ b/multimc.qrc @@ -34,4 +34,7 @@ <file alias="scalable/apps/multimc.svg">resources/icons/multimc.svg</file> <file alias="index.theme">resources/XdgIcon.theme</file> </qresource> + <qresource prefix="/backgrounds"> + <file alias="kitteh">resources/catbgrnd2.png</file> + </qresource> </RCC> |