mage/Mage.Tests/src
LevelX2 7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
..
frozen/org/mage/test/clientside XMage 1.4.17V0 2016-10-23 10:03:01 +02:00
test Merge origin/master 2017-01-06 21:57:18 +01:00