summaryrefslogtreecommitdiff
path: root/npcs.xml
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2009-05-29 18:31:09 -0400
committerChuck Miller <shadowmil@gmail.com>2009-05-29 18:31:09 -0400
commit725e8f8839ff699174075ae1043d46db7a133328 (patch)
tree2ecb4057855a256d68c0778e47944be9d3fd42af /npcs.xml
parent160c2478a57a6a8e1adbf382219971c603273480 (diff)
parent7a0a3dc90ddaad2e402ce70d861b67cc5f8f1caa (diff)
downloadclientdata-725e8f8839ff699174075ae1043d46db7a133328.tar.gz
clientdata-725e8f8839ff699174075ae1043d46db7a133328.tar.bz2
clientdata-725e8f8839ff699174075ae1043d46db7a133328.tar.xz
clientdata-725e8f8839ff699174075ae1043d46db7a133328.zip
Merge branch 'master' of git://gitorious.org/tmwdata/mainline
Diffstat (limited to 'npcs.xml')
-rw-r--r--npcs.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/npcs.xml b/npcs.xml
index 96fa7b1d..9357f561 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -85,6 +85,7 @@
<npc id="171"><sprite variant="71">npc.xml</sprite></npc><!-- Injured Mouboo -->
<npc id="172"><sprite variant="72">npc.xml</sprite></npc><!-- Katze -->
<npc id="173"><sprite variant="73">npc.xml</sprite></npc><!-- Easter Bunny -->
+<npc id="174"><sprite variant="74">npc.xml</sprite></npc><!-- Aisha, Omar's daughter -->
<npc id="200">
<sprite>npc-test.xml</sprite>