From fc63e88f869919a8b035a5c41db8d05626526bde Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 11 Mar 2007 19:59:55 +0000 Subject: Merged 0.0 changes from revision 3065 to 3177 to trunk. --- data/graphics/CMakeLists.txt | 1 - data/graphics/Makefile.am | 2 +- data/graphics/gui/mouse.png | Bin 449 -> 984 bytes data/graphics/gui/target-cursor-blue.png | Bin 0 -> 8353 bytes data/graphics/gui/target-cursor-red.png | Bin 0 -> 8361 bytes data/help/header.txt | 2 +- 6 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 data/graphics/gui/target-cursor-blue.png create mode 100644 data/graphics/gui/target-cursor-red.png (limited to 'data') 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 Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png 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 Binary files /dev/null and b/data/graphics/gui/target-cursor-blue.png 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 Binary files /dev/null and b/data/graphics/gui/target-cursor-red.png 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 -- cgit v1.2.3-70-g09d2