Merge branch 'master' into Network_Upgrade

This commit is contained in:
betasteward 2015-05-28 21:06:32 -04:00
commit e7bb3a0dbf
324 changed files with 9827 additions and 1835 deletions

View file

@ -42,7 +42,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 0;
public final static String MAGE_VERSION_MINOR_PATCH = "v0";
public final static String MAGE_VERSION_MINOR_PATCH = "v2";
public final static String MAGE_VERSION_INFO = "";
private final int major;