maustin 53a03b94d4 Merge branch 'master' into historicformats ...

# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java

2018-04-18 23:00:56 +01:00

..

.settings

Normalize line endings

2017-12-28 23:40:29 -05:00

src

Merge branch 'master' into historicformats

2018-04-18 23:00:56 +01:00

.classpath

Complete update to Java 8.

2018-04-16 20:38:20 -07:00

.project

Normalize line endings

2017-12-28 23:40:29 -05:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2018-03-20 01:14:26 +00:00