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
..
frozen/org/mage/test/clientside	Change all line endings to LF	2016-04-14 16:18:01 +00:00
test	Merge remote-tracking branch 'origin/master'	2016-07-10 19:01:20 -04:00