diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 00:23:50 -0700 |
| commit | 5e3b3ca60fd86cc0872901dcd888d20077c040a0 (patch) | |
| tree | c4260b129e4ca6105559017fa09f3c02294fd397 /graphics/sprites/head-deserthat.xml | |
| parent | a1d23a0a3dae86aa3a20a0fe3fbb4e953045427a (diff) | |
| parent | c3a4cf5300255bb08c50827b89baceccc42bdd3a (diff) | |
| download | clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.gz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.bz2 clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.tar.xz clientdata-5e3b3ca60fd86cc0872901dcd888d20077c040a0.zip | |
Merge branch 'real-master' into fresh-master
Conflicts:
graphics/sprites/head-deserthat.xml
Diffstat (limited to 'graphics/sprites/head-deserthat.xml')
| -rw-r--r-- | graphics/sprites/head-deserthat.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/sprites/head-deserthat.xml b/graphics/sprites/head-deserthat.xml index 09297c3f..5eab2ef7 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/item007.png|R" width="32" height="35" /> + <imageset name="base" src="graphics/sprites/head-deserthat.png|R;W" width="32" height="35" /> <action name="stand" imageset="base"> <animation direction="down"> |