Merge remote branch 'upstream/master' into HEAD

This commit is contained in:
Mike Primm 2011-07-06 09:44:13 -05:00
commit ee8718d083
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId> <artifactId>dynmap</artifactId>
<version>0.19.2</version> <version>0.20</version>
<name>dynmap</name> <name>dynmap</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

View File

@ -1,6 +1,6 @@
name: dynmap name: dynmap
main: org.dynmap.DynmapPlugin main: org.dynmap.DynmapPlugin
version: "0.19.2" version: "0.20"
authors: [FrozenCow, mikeprimm, zeeZ] authors: [FrozenCow, mikeprimm, zeeZ]
softdepend: [Permissions] softdepend: [Permissions]
commands: commands: