From b9cc0a7976958e6df3dd6c07dbe6fc3315d25bec Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 20 Mar 2012 00:11:08 +0200
Subject: [PATCH] Move icon files to misc/

---
 CMakeLists.txt                                      |   2 +-
 .../minetest-icon-24x24.png                         | Bin
 minetest-icon.ico => misc/minetest-icon.ico         | Bin
 minetest-icon.svg => misc/minetest-icon.svg         |   0
 src/winresource.rc                                  |   4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename minetest-icon-24x24.png => misc/minetest-icon-24x24.png (100%)
 rename minetest-icon.ico => misc/minetest-icon.ico (100%)
 rename minetest-icon.svg => misc/minetest-icon.svg (100%)

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
similarity index 100%
rename from minetest-icon-24x24.png
rename to misc/minetest-icon-24x24.png
diff --git a/minetest-icon.ico b/misc/minetest-icon.ico
similarity index 100%
rename from minetest-icon.ico
rename to misc/minetest-icon.ico
diff --git a/minetest-icon.svg b/misc/minetest-icon.svg
similarity index 100%
rename from minetest-icon.svg
rename to 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"