Samuel Sandeen 6cf04e9bd2 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Mage.Sets/src/mage/sets/gatecrash/Hindervines.java # Mage.Sets/src/mage/sets/timeshifted/Darkness.java		2016-07-10 19:01:20 -04:00
..
src	Merge remote-tracking branch 'origin/master'	2016-07-10 19:01:20 -04:00
manifest.mf
pom.xml	Xmage 1.4.12v0	2016-05-29 10:59:39 +02:00