mage/Mage/src/main
LevelX2 7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
..
java/mage Merge origin/master 2017-01-06 21:57:18 +01:00
proto specify proto2 syntax 2016-11-05 11:26:30 -07:00