From 90cbf4bb528c5675ede16cb6236b84a2f6510e43 Mon Sep 17 00:00:00 2001
From: CorruptComputer <NGupton98@gmail.com>
Date: Fri, 12 Dec 2014 18:32:34 -0600
Subject: [PATCH] Moved map merge source to a folder

---
 tools/mapmerge/{ => Source}/Location.java        | 0
 tools/mapmerge/{ => Source}/META-INF/MANIFEST.MF | 8 ++++----
 tools/mapmerge/{ => Source}/Map.java             | 0
 tools/mapmerge/{ => Source}/MapPatcher.java      | 0
 tools/mapmerge/{ => Source}/SavingThread.java    | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename tools/mapmerge/{ => Source}/Location.java (100%)
 rename tools/mapmerge/{ => Source}/META-INF/MANIFEST.MF (95%)
 rename tools/mapmerge/{ => Source}/Map.java (100%)
 rename tools/mapmerge/{ => Source}/MapPatcher.java (100%)
 rename tools/mapmerge/{ => Source}/SavingThread.java (100%)

diff --git a/tools/mapmerge/Location.java b/tools/mapmerge/Source/Location.java
similarity index 100%
rename from tools/mapmerge/Location.java
rename to tools/mapmerge/Source/Location.java
diff --git a/tools/mapmerge/META-INF/MANIFEST.MF b/tools/mapmerge/Source/META-INF/MANIFEST.MF
similarity index 95%
rename from tools/mapmerge/META-INF/MANIFEST.MF
rename to tools/mapmerge/Source/META-INF/MANIFEST.MF
index d66a7b3b698..5aa53c2fa28 100644
--- a/tools/mapmerge/META-INF/MANIFEST.MF
+++ b/tools/mapmerge/Source/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
-Created-By: 1.6.0_31 (Sun Microsystems Inc.)
-Main-Class: MapPatcher
-
+Manifest-Version: 1.0
+Created-By: 1.6.0_31 (Sun Microsystems Inc.)
+Main-Class: MapPatcher
+
diff --git a/tools/mapmerge/Map.java b/tools/mapmerge/Source/Map.java
similarity index 100%
rename from tools/mapmerge/Map.java
rename to tools/mapmerge/Source/Map.java
diff --git a/tools/mapmerge/MapPatcher.java b/tools/mapmerge/Source/MapPatcher.java
similarity index 100%
rename from tools/mapmerge/MapPatcher.java
rename to tools/mapmerge/Source/MapPatcher.java
diff --git a/tools/mapmerge/SavingThread.java b/tools/mapmerge/Source/SavingThread.java
similarity index 100%
rename from tools/mapmerge/SavingThread.java
rename to tools/mapmerge/Source/SavingThread.java