diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-31 14:24:38 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-31 14:24:38 +0200 |
| commit | fb9038cdcf656da8c37d9eeab06df7c4781b5bd5 (patch) | |
| tree | 792c6f11d8112c82f09bed4d5217561745481e47 /graphics/sprites/npcs/nivalis_npc.xml | |
| parent | d12e2c82369d874167f3ca2f5f4fc687b850da1a (diff) | |
| parent | 7741f3f564baede98efe5068286e67562a75bb60 (diff) | |
| download | clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.gz clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.bz2 clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.xz clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.zip | |
Merge remote-tracking branch 'mainline/master'
Conflicts:
items.xml
Diffstat (limited to 'graphics/sprites/npcs/nivalis_npc.xml')
| -rw-r--r-- | graphics/sprites/npcs/nivalis_npc.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/sprites/npcs/nivalis_npc.xml b/graphics/sprites/npcs/nivalis_npc.xml index 79b76301..54129cab 100644 --- a/graphics/sprites/npcs/nivalis_npc.xml +++ b/graphics/sprites/npcs/nivalis_npc.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <sprite variants="6" variant_offset="1"> - <imageset name="base" src="graphics/sprites/npcs/nivalis_npcs.png" width="50" height="80" /> + <imageset name="base" src="graphics/sprites/npcs/nivalis_npc.png" width="50" height="80" /> <action name="stand" imageset="base"> <animation direction="default"> |