foul-magics/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage
LevelX2 3f57012c85 Merge origin/master
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
2016-03-03 23:22:06 +01:00
..
player/ai Merge origin/master 2016-03-03 23:22:06 +01:00