summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMysteries <mysteriousragnarok@hotmail.com>2013-02-10 23:56:15 -0500
committerMysteries <mysteriousragnarok@hotmail.com>2013-02-10 23:56:32 -0500
commitabd09b2583a6d72c0012e0d5e0c4051b274dd3d9 (patch)
tree4b58d09e2056b98abc609baba3f9f5859b3f1883
parenta2420e71f388134ec0cd631bf424735c307c8a0d (diff)
downloadhercules-abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.tar.gz
hercules-abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.tar.bz2
hercules-abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.tar.xz
hercules-abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.zip
Maps
- Removed maps that are no longer supported in the cache - Added new maps into the cache - Removed duplicate entries
-rw-r--r--conf/maps.conf4
-rw-r--r--db/map_index.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/conf/maps.conf b/conf/maps.conf
index 7a0169dd2..01baea7da 100644
--- a/conf/maps.conf
+++ b/conf/maps.conf
@@ -1048,7 +1048,11 @@ map: moc_prydn1
map: moc_prydn2
// ===============================
+<<<<<<< HEAD
// New Maps added 2013-02-10
+=======
+// New Maps added 2013-02-10 (Thanks Streusel!)
+>>>>>>> Maps
// ===============================
//map: iz_int
//map: iz_int01
diff --git a/db/map_index.txt b/db/map_index.txt
index 9f6b22d7f..15e01e270 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -858,7 +858,11 @@ moc_prydn1
moc_prydn2
// ===============================
+<<<<<<< HEAD
// New Maps added 2013-02-10
+=======
+// New Maps added 2013-02-10 (Thanks Streusel!)
+>>>>>>> Maps
// ===============================
//iz_int
//iz_int01