Merge branch 'master' into malte-ai

This commit is contained in:
Malte Tammena 2017-10-18 14:10:54 +02:00
commit 3c2e947b33

View file

@ -17,8 +17,8 @@ src/game/GameHistory.java \
src/game/GameEntry.java \ src/game/GameEntry.java \
src/game/PlayerObject.java \ src/game/PlayerObject.java \
src/player/Player.java \ src/player/Player.java \
src/player/MalteAI.java \ src/player/malte/MalteAI.java \
src/player/MaurizioAI.java src/player/maurizio/MaurizioAI.java
OBJECTS=$($(subst $(CLASSPATH),$(BUILDS),$(CLASSES)):.java=.class) OBJECTS=$($(subst $(CLASSPATH),$(BUILDS),$(CLASSES)):.java=.class)