From 4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 4 Jan 2007 02:20:38 +0000
Subject: Merged 0.0 changes from revision 2898 to 2988 to trunk.

---
 data/CMakeLists.txt                 |  9 ---------
 data/Makefile.am                    |  9 +--------
 data/graphics/CMakeLists.txt        |  1 -
 data/graphics/Makefile.am           |  2 +-
 data/graphics/images/CMakeLists.txt | 14 ++------------
 data/graphics/images/Makefile.am    | 14 ++------------
 data/help/header.txt                |  2 +-
 7 files changed, 7 insertions(+), 44 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e60bfe30..3c482b49 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -3,12 +3,3 @@ SET(DATA_DIR ${PKG_DATADIR}/data)
 ADD_SUBDIRECTORY(graphics)
 ADD_SUBDIRECTORY(help)
 ADD_SUBDIRECTORY(icons)
-ADD_SUBDIRECTORY(maps)
-ADD_SUBDIRECTORY(sfx)
-
-SET(FILES
-	equipment.xml
-    items.xml
-    )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
\ No newline at end of file
diff --git a/data/Makefile.am b/data/Makefile.am
index ed080d08..5a28f7c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,4 @@
 
-SUBDIRS = graphics help icons maps sfx
+SUBDIRS = graphics help icons
 
 tmwdatadir = $(pkgdatadir)/data
-
-tmwdata_DATA =			\
-	equipment.xml	\
-	items.xml
-
-EXTRA_DIST =			\
-	$(tmwdata_DATA)
\ No newline at end of file
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index c569e04f..0fa9a7be 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,5 +1,4 @@
 ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(sprites)
 ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 19e95869..43354894 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = gui images items sprites tiles
+SUBDIRS = gui images sprites tiles
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index f02cd2ea..a8b6ddbd 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,18 +1,8 @@
 ADD_SUBDIRECTORY(ambient)
 
 SET(FILES
-	error.png
+    error.png
     login_wallpaper.png
-    minimap_new_1-1.png
-    minimap_new_14-1.png
-    minimap_new_15-1.png
-    minimap_new_16-1.png
-    minimap_new_2-1.png
-    minimap_new_3-1.png
-    minimap_new_5-1.png
-    minimap_new_7-1.png
-    minimap_new_9-1.png
-    minimap_new_17-1.png
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
\ No newline at end of file
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index 00d9ed7e..be8593f6 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -4,17 +4,7 @@ imagesdir = $(pkgdatadir)/data/graphics/images
 
 images_DATA =				\
 	error.png				\
-	login_wallpaper.png		\
-	minimap_new_1-1.png		\
-	minimap_new_2-1.png		\
-	minimap_new_3-1.png		\
-	minimap_new_5-1.png		\
-	minimap_new_7-1.png		\
-	minimap_new_9-1.png		\
-	minimap_new_14-1.png	\
-	minimap_new_15-1.png	\
-	minimap_new_16-1.png	\
-	minimap_new_17-1.png
+	login_wallpaper.png
 
 EXTRA_DIST =				\
-	$(images_DATA)
\ No newline at end of file
+	$(images_DATA)
diff --git a/data/help/header.txt b/data/help/header.txt
index b292388a..4f4c9615 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.21.1                  ##2Date:##30 October 2006
+           ##2Version:##6 0.0.22                  ##2Date:##324 December 2006
  
 ##2                    Website: http://themanaworld.org
  
-- 
cgit v1.2.3-70-g09d2