summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 15:22:13 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-05 15:22:13 +0000
commit6374ef220d8f46647190074338f868b5d6bb4a45 (patch)
treea833453c2e712c3e992f71433f6d21c8c379ad15 /data
parentde61b658590630cfc59960c012c8e533b361a8b0 (diff)
downloadmana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.gz
mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.bz2
mana-6374ef220d8f46647190074338f868b5d6bb4a45.tar.xz
mana-6374ef220d8f46647190074338f868b5d6bb4a45.zip
Merged 0.0 changes from revision 2800 to 2825 to trunk.
Diffstat (limited to 'data')
-rw-r--r--data/graphics/images/CMakeLists.txt3
-rw-r--r--data/graphics/images/Makefile.am3
-rw-r--r--data/graphics/images/login_wallpaper.pngbin205907 -> 215527 bytes
3 files changed, 4 insertions, 2 deletions
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
index 471d4c92..53f8b3a7 100644
--- a/data/graphics/images/CMakeLists.txt
+++ b/data/graphics/images/CMakeLists.txt
@@ -11,6 +11,7 @@ SET(FILES
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)
+INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images) \ No newline at end of file
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
index fb54cb95..cc71b18a 100644
--- a/data/graphics/images/Makefile.am
+++ b/data/graphics/images/Makefile.am
@@ -12,7 +12,8 @@ images_DATA = \
minimap_new_9-1.png \
minimap_new_14-1.png \
minimap_new_15-1.png \
- minimap_new_16-1.png
+ minimap_new_16-1.png \
+ minimap_new_17-1.png
EXTRA_DIST = \
$(images_DATA) \ No newline at end of file
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 258bad22..54692dfd 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
Binary files differ