diff options
| author | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
| commit | 23474da17500b35bf4fb2a754021175361baab00 (patch) | |
| tree | db2dda426ec4a91982f5f5539b08cc7c3bb1fd35 /multimc.qrc | |
| parent | 498225debdb22d83e591635dbd172cca12476279 (diff) | |
| parent | 4fd5bdb01b27c99f16c9acf3c7ac13c7ea719800 (diff) | |
| download | MultiMC-23474da17500b35bf4fb2a754021175361baab00.tar MultiMC-23474da17500b35bf4fb2a754021175361baab00.tar.gz MultiMC-23474da17500b35bf4fb2a754021175361baab00.tar.lz MultiMC-23474da17500b35bf4fb2a754021175361baab00.tar.xz MultiMC-23474da17500b35bf4fb2a754021175361baab00.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
main.cpp
Diffstat (limited to 'multimc.qrc')
| -rw-r--r-- | multimc.qrc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/multimc.qrc b/multimc.qrc index d0171fa3..cfcc9829 100644 --- a/multimc.qrc +++ b/multimc.qrc @@ -28,6 +28,10 @@ <file alias="infinity">resources/icons/multimc.svg</file> </qresource> <qresource prefix="/launcher"> - <file alias="launcherjar">resources/MultiMCLauncher.jar</file> + <file alias="launcher.jar">resources/MultiMCLauncher.jar</file> + </qresource> + <qresource prefix="/icons/multimc"> + <file alias="scalable/apps/multimc.svg">resources/icons/multimc.svg</file> + <file alias="index.theme">resources/XdgIcon.theme</file> </qresource> </RCC> |