diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-20 00:11:08 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-20 00:32:43 +0200 |
| commit | b9cc0a7976958e6df3dd6c07dbe6fc3315d25bec (patch) | |
| tree | dfff372eed6dddafe8718e4680e564b80853f92e | |
| parent | 97b693052cd5da228016afa6b31f07970b37569a (diff) | |
| download | minetest-b9cc0a7976958e6df3dd6c07dbe6fc3315d25bec.tar.gz minetest-b9cc0a7976958e6df3dd6c07dbe6fc3315d25bec.tar.bz2 minetest-b9cc0a7976958e6df3dd6c07dbe6fc3315d25bec.zip | |
Move icon files to misc/
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | misc/minetest-icon-24x24.png (renamed from minetest-icon-24x24.png) | bin | 913 -> 913 bytes | |||
| -rw-r--r-- | misc/minetest-icon.ico (renamed from minetest-icon.ico) | bin | 9662 -> 9662 bytes | |||
| -rw-r--r-- | misc/minetest-icon.svg (renamed from minetest-icon.svg) | 0 | ||||
| -rw-r--r-- | src/winresource.rc | 4 |
5 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01d03a574..257df6cec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") if(UNIX) install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") - install(FILES "minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") + install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps") endif() # diff --git a/minetest-icon-24x24.png b/misc/minetest-icon-24x24.png Binary files differindex 4d587c410..4d587c410 100644 --- a/minetest-icon-24x24.png +++ b/misc/minetest-icon-24x24.png diff --git a/minetest-icon.ico b/misc/minetest-icon.ico Binary files differindex 82af67bf9..82af67bf9 100644 --- a/minetest-icon.ico +++ b/misc/minetest-icon.ico diff --git a/minetest-icon.svg b/misc/minetest-icon.svg index 46c9ac702..46c9ac702 100644 --- a/minetest-icon.svg +++ b/misc/minetest-icon.svg diff --git a/src/winresource.rc b/src/winresource.rc index 24ec445aa..4770c87b4 100644 --- a/src/winresource.rc +++ b/src/winresource.rc @@ -2,5 +2,5 @@ #include <commctrl.h>
#include <richedit.h>
LANGUAGE 0, SUBLANG_NEUTRAL
-130 ICON "..\\minetest-icon.ico"
-//131 BITMAP "..\\minetest-icon.bmp"
+130 ICON "..\\misc\\minetest-icon.ico"
+//131 BITMAP "..\\misc\\minetest-icon.bmp"
|
