summaryrefslogtreecommitdiff
path: root/npc/031-1_NivalisPort/angelaOutside.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2010-12-30 20:57:23 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2010-12-30 20:57:23 +0100
commit83071e29cdcc5c292d6ea8e9782f9b94135f3dae (patch)
tree1ec1d99251279a7c8a7d93fd32aad39a4f20c931 /npc/031-1_NivalisPort/angelaOutside.txt
parentb05725073e101b2e18224407d4d5624971471724 (diff)
parentb7dc8b21680e24675c61c868608f33ac596f2554 (diff)
downloadserverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.gz
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.bz2
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.tar.xz
serverdata-83071e29cdcc5c292d6ea8e9782f9b94135f3dae.zip
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Conflicts: npc/031-3_Cave/_mobs.txt
Diffstat (limited to 'npc/031-1_NivalisPort/angelaOutside.txt')
0 files changed, 0 insertions, 0 deletions