summaryrefslogtreecommitdiff
path: root/conf/mapflag/nobranch.txt
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-09 09:09:35 +0000
commit1260d294ed795011b5b73284e308a6a01d9eef9e (patch)
tree6663a0ae44f8ac7d830598311411843401f129a1 /conf/mapflag/nobranch.txt
parent28532995686a5315ddf0ad6557ae00cb2fe76206 (diff)
downloadhercules-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 'conf/mapflag/nobranch.txt')
-rw-r--r--conf/mapflag/nobranch.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt
index 3e91263da..0684fbe74 100644
--- a/conf/mapflag/nobranch.txt
+++ b/conf/mapflag/nobranch.txt
@@ -335,4 +335,8 @@ jupe_core2 mapflag nobranch
brasilis mapflag nobranch
bra_in01 mapflag nobranch
-//evt_zombie mapflag nobranch \ No newline at end of file
+//evt_zombie mapflag nobranch
+
+// Poring War ==================
+poring_w01 mapflag nobranch
+poring_w02 mapflag nobranch \ No newline at end of file