diff options
author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:01:54 +0100 |
---|---|---|
committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:01:54 +0100 |
commit | cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e (patch) | |
tree | a4148d6bb1704e635807c37b36013e9a33820a80 /multimc.qrc | |
parent | f4c9cb8c1d395422b7e4f1c27ac92b6df08a39bb (diff) | |
parent | e4806ab08d0293d395c1718ab16d28ba2ae9d0ed (diff) | |
download | MultiMC-cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e.tar MultiMC-cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e.tar.gz MultiMC-cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e.tar.lz MultiMC-cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e.tar.xz MultiMC-cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e.zip |
Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
main.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> |