Evan Kranzler 0656f97d7c Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt		2017-09-07 11:36:07 -04:00
..
src	Merge branch 'master' of https://github.com/magefree/mage into magefree-master	2017-09-07 11:36:07 -04:00
manifest.mf
pom.xml	xmage 1.4.26V0	2017-08-15 01:27:06 +02:00