From 8da32105732949b4b0273c718d118bcfae70a1c9 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 11 Dec 2006 15:47:35 +0000
Subject: Merged 0.0 changes from revision 2825 to 2898 to trunk.

---
 data/CMakeLists.txt                 |   3 ++-
 data/Makefile.am                    |   3 ++-
 data/graphics/images/CMakeLists.txt |   1 +
 data/graphics/images/Makefile.am    |   1 +
 data/graphics/images/error.png      | Bin 0 -> 314 bytes
 5 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 data/graphics/images/error.png

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 36259082..e60bfe30 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,7 +7,8 @@ ADD_SUBDIRECTORY(maps)
 ADD_SUBDIRECTORY(sfx)
 
 SET(FILES
+	equipment.xml
     items.xml
     )
 
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR})
\ No newline at end of file
diff --git a/data/Makefile.am b/data/Makefile.am
index 7d16a1fc..ed080d08 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,8 @@ SUBDIRS = graphics help icons maps sfx
 tmwdatadir = $(pkgdatadir)/data
 
 tmwdata_DATA =			\
+	equipment.xml	\
 	items.xml
 
 EXTRA_DIST =			\
-	$(tmwdata_DATA)
+	$(tmwdata_DATA)
\ No newline at end of file
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 53f8b3a7..f02cd2ea 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -1,6 +1,7 @@
 ADD_SUBDIRECTORY(ambient)
 
 SET(FILES
+	error.png
     login_wallpaper.png
     minimap_new_1-1.png
     minimap_new_14-1.png
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index cc71b18a..00d9ed7e 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = ambient
 imagesdir = $(pkgdatadir)/data/graphics/images
 
 images_DATA =				\
+	error.png				\
 	login_wallpaper.png		\
 	minimap_new_1-1.png		\
 	minimap_new_2-1.png		\
diff --git a/data/graphics/images/error.png b/data/graphics/images/error.png
new file mode 100644
index 00000000..6fd7c1a8
Binary files /dev/null and b/data/graphics/images/error.png differ
-- 
cgit v1.2.3-70-g09d2