diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-09 09:09:35 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-09 09:09:35 +0000 |
commit | 1260d294ed795011b5b73284e308a6a01d9eef9e (patch) | |
tree | 6663a0ae44f8ac7d830598311411843401f129a1 /npc/scripts_athena.conf | |
parent | 28532995686a5315ddf0ad6557ae00cb2fe76206 (diff) | |
download | hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.gz hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.bz2 hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.tar.xz hercules-1260d294ed795011b5b73284e308a6a01d9eef9e.zip |
* Merged changes from trunk [14742:14782/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/scripts_athena.conf')
-rw-r--r-- | npc/scripts_athena.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index 25686827e..a479f532a 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -297,6 +297,7 @@ npc: npc/other/mail.txt npc: npc/other/marriage.txt npc: npc/other/monster_museum.txt //npc: npc/other/msg_boards.txt +npc: npc/other/poring_war.txt npc: npc/other/powernpc.txt npc: npc/other/pvp.txt npc: npc/other/resetskill.txt |