summaryrefslogtreecommitdiff
path: root/data/graphics
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-11 15:47:35 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-11 15:47:35 +0000
commit8da32105732949b4b0273c718d118bcfae70a1c9 (patch)
tree0a354974d48268cfaafcdb1e06b498fa26a59c1e /data/graphics
parentf9ce4e302cb3ed203d89a7a18e10b7ad4f11519c (diff)
downloadmana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.gz
mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.bz2
mana-8da32105732949b4b0273c718d118bcfae70a1c9.tar.xz
mana-8da32105732949b4b0273c718d118bcfae70a1c9.zip
Merged 0.0 changes from revision 2825 to 2898 to trunk.
Diffstat (limited to 'data/graphics')
-rw-r--r--data/graphics/images/CMakeLists.txt1
-rw-r--r--data/graphics/images/Makefile.am1
-rw-r--r--data/graphics/images/error.pngbin0 -> 314 bytes
3 files changed, 2 insertions, 0 deletions
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
--- /dev/null
+++ b/data/graphics/images/error.png
Binary files differ