summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-02 18:58:11 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-02 18:58:11 +0000
commitcc8c1998deaa09368df0970d84005d3a0f904dce (patch)
treeb874440914aba3701431d6837f559ed78c482860 /conf
parent99c114220e9f745df7b017383af388d2189ff3e6 (diff)
downloadhercules-cc8c1998deaa09368df0970d84005d3a0f904dce.tar.gz
hercules-cc8c1998deaa09368df0970d84005d3a0f904dce.tar.bz2
hercules-cc8c1998deaa09368df0970d84005d3a0f904dce.tar.xz
hercules-cc8c1998deaa09368df0970d84005d3a0f904dce.zip
Uncommented pvp_room in maps_athena.conf
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13654 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/maps_athena.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index a4fd395f5..30466cf5a 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
+2009/04/02
+ * Uncommented pvp_room in maps_athena.conf [Playtester]
2009/04/01
* Removed online_check config options. [FlavioJS]
* Clarified char_maintenance config option.
diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf
index 847a8b300..64adb2fdf 100644
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -227,7 +227,7 @@ map: prt_sewb1
map: prt_sewb2
map: prt_sewb3
map: prt_sewb4
-//map: pvp_room
+map: pvp_room
map: pvp_2vs2
map: pvp_c_room
map: pvp_n_1-1