Ludwig.Hirth a175ac3a1d Merge origin/master ... Conflicts: Mage.Sets/src/mage/cards/c/CogworkAssembler.java		2017-01-19 17:01:34 +01:00
..
src	Merge origin/master	2017-01-19 17:01:34 +01:00
manifest.mf
pom.xml	Xmage 1.4.21V0	2017-01-15 17:44:02 +01:00