mage/Mage/src
LevelX2 7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
..
main Merge origin/master 2017-01-06 21:57:18 +01:00
test/java/mage Some changes to mana handling to handle {C} mana. 2016-01-08 23:25:42 +01:00