* Merged changes from trunk [14895:14966/trunk].

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei
2011-10-07 21:35:12 +00:00
parent 4ac7586ed4
commit 6a6aa10721
88 changed files with 4489 additions and 2722 deletions

View File

@@ -27,4 +27,5 @@ npc: conf/mapflag/battleground.txt
npc: conf/mapflag/fireworks.txt
npc: conf/mapflag/novending.txt
npc: conf/mapflag/town.txt
npc: conf/mapflag/reset.txt
// --------------------------------------------------------------