summaryrefslogtreecommitdiff
path: root/graphics/sprites
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-11-23 00:18:15 -0700
committerFate <fate-tmw@googlemail.com>2008-11-23 00:18:15 -0700
commitc3a4cf5300255bb08c50827b89baceccc42bdd3a (patch)
treebd6431ba56fed5254b65c1ea303e379083435f66 /graphics/sprites
parente3b59cb72c6b23587343b54ac316780fc1f2bd13 (diff)
parentc46a63c19a6931cfd9f64c273bed02f61da73dd1 (diff)
downloadclientdata-c3a4cf5300255bb08c50827b89baceccc42bdd3a.tar.gz
clientdata-c3a4cf5300255bb08c50827b89baceccc42bdd3a.tar.bz2
clientdata-c3a4cf5300255bb08c50827b89baceccc42bdd3a.tar.xz
clientdata-c3a4cf5300255bb08c50827b89baceccc42bdd3a.zip
Merge branch 'map-renaming' into real-master
Conflicts: graphics/items/armor-head-standardheadband.png graphics/sprites/item007.png monsters.xml
Diffstat (limited to 'graphics/sprites')
-rw-r--r--graphics/sprites/head-deserthat.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml
index 0dba8b8e..920baeb3 100644
--- a/graphics/sprites/head-deserthat.xml
+++ b/graphics/sprites/head-deserthat.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/head-deserthat.png" width="32" height="35" />
+ <imageset name="base" src="graphics/sprites/head-deserthat.png|R" width="32" height="35" />
<action name="stand" imageset="base">
<animation direction="down">