FrozenCow 1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver ...

Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js

2011-02-22 17:58:39 +01:00

src/main

Merge remote-tracking branch 'kilandor/master' into nowebserver

2011-02-22 17:58:39 +01:00

web

Merge remote-tracking branch 'kilandor/master' into nowebserver

2011-02-22 17:58:39 +01:00

.gitignore

Added ignores.

2011-01-25 22:56:35 +01:00

assembly.xml

Made Dynmap package not include subdirectory.

2011-02-22 14:09:14 +01:00

build_parameters.xml

Added seperate file for ant build parameters.

2011-01-05 21:17:27 +01:00

build.xml

Removed web from jar.

2011-01-18 20:54:32 +01:00

configuration.txt

Merge remote-tracking branch 'kilandor/master' into nowebserver

2011-02-22 17:58:39 +01:00

pom.xml

Automagic packages built. Love me for this. :)

2011-02-19 21:49:24 -08:00

S

Description

No description provided

Apache-2.0 4.8 MiB

Languages

Java 100%