Derek Monturo ae38095c58 merge		2017-05-11 12:12:20 -04:00
..
main	merge	2017-05-11 12:12:20 -04:00
test/java/mage	changed cardtype from list to enumset	2017-03-03 17:04:32 +01:00