summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-24 21:24:57 -0700
committerFate <fate-tmw@googlemail.com>2008-12-24 21:24:57 -0700
commit562a0fdbaa002a49f4763bd07442e2ed32726ab9 (patch)
tree0e997cd03f8a03e8bf839890318efd15a0242dc2 /tools
parent63006fa540fe6fbddd132be33b39fd28f02a2e0f (diff)
parente896b785935c661319ade424f473f4442e1878eb (diff)
downloadserverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.gz
serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.bz2
serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.tar.xz
serverdata-562a0fdbaa002a49f4763bd07442e2ed32726ab9.zip
Merge branch 'master' into magicv2008.12.25
Diffstat (limited to 'tools')
-rwxr-xr-xtools/tmwcon/build.xml2
-rw-r--r--tools/tmwcon/src/converter/Main.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/tmwcon/build.xml b/tools/tmwcon/build.xml
index 6edf8477..b2937e66 100755
--- a/tools/tmwcon/build.xml
+++ b/tools/tmwcon/build.xml
@@ -1,4 +1,4 @@
-<project name="The Mana World Workshop" default="dist">
+<project name="TMWServ to eAthena Converter" default="dist">
<description>
A tool to convert map data from TMWServ format to eAthena format
</description>
diff --git a/tools/tmwcon/src/converter/Main.java b/tools/tmwcon/src/converter/Main.java
index c48ca286..0b4c67aa 100644
--- a/tools/tmwcon/src/converter/Main.java
+++ b/tools/tmwcon/src/converter/Main.java
@@ -10,7 +10,7 @@ import java.util.*;
import tiled.io.xml.*;
-public class Main extends Thread {
+public class Main {
public static XMLMapTransformer reader = null;
private static tiled.core.Map loadMap(File file) {