summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-11 19:59:55 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-03-11 19:59:55 +0000
commitfc63e88f869919a8b035a5c41db8d05626526bde (patch)
tree8f1928d082ebbffc549c712a3f406c2141f43e01 /data
parent7b0f0ec315e66dcbdda58ada8b09a59bc5dcf6c9 (diff)
downloadMana-fc63e88f869919a8b035a5c41db8d05626526bde.tar.gz
Mana-fc63e88f869919a8b035a5c41db8d05626526bde.tar.bz2
Mana-fc63e88f869919a8b035a5c41db8d05626526bde.tar.xz
Mana-fc63e88f869919a8b035a5c41db8d05626526bde.zip
Merged 0.0 changes from revision 3065 to 3177 to trunk.
Diffstat (limited to 'data')
-rw-r--r--data/graphics/CMakeLists.txt1
-rw-r--r--data/graphics/Makefile.am2
-rw-r--r--data/graphics/gui/mouse.pngbin449 -> 984 bytes
-rw-r--r--data/graphics/gui/target-cursor-blue.pngbin0 -> 8353 bytes
-rw-r--r--data/graphics/gui/target-cursor-red.pngbin0 -> 8361 bytes
-rw-r--r--data/help/header.txt2
6 files changed, 2 insertions, 3 deletions
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
index 0fa9a7be..9a916db3 100644
--- a/data/graphics/CMakeLists.txt
+++ b/data/graphics/CMakeLists.txt
@@ -1,4 +1,3 @@
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(sprites)
ADD_SUBDIRECTORY(tiles)
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
index 43354894..8cda8fa3 100644
--- a/data/graphics/Makefile.am
+++ b/data/graphics/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = gui images sprites tiles
+SUBDIRS = gui images tiles
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index e6a84021..9276fc7c 100644
--- a/data/graphics/gui/mouse.png
+++ b/data/graphics/gui/mouse.png
Binary files differ
diff --git a/data/graphics/gui/target-cursor-blue.png b/data/graphics/gui/target-cursor-blue.png
new file mode 100644
index 00000000..3e81c75d
--- /dev/null
+++ b/data/graphics/gui/target-cursor-blue.png
Binary files differ
diff --git a/data/graphics/gui/target-cursor-red.png b/data/graphics/gui/target-cursor-red.png
new file mode 100644
index 00000000..09195f44
--- /dev/null
+++ b/data/graphics/gui/target-cursor-red.png
Binary files differ
diff --git a/data/help/header.txt b/data/help/header.txt
index aef87a45..7311c111 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.22.1 ##2Date:##315 January 2007
+ ##2Version:##6 0.0.22.2 ##2Date:##317 February 2007
##2 Website: http://themanaworld.org