github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
mage/Mage/src
History
Samuel Sandeen 434be545f7 Merge remote-tracking branch 'magefree/master' 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
2016-09-03 20:06:33 -04:00
..
main Merge remote-tracking branch 'magefree/master' 2016-09-03 20:06:33 -04:00
test/java/mage Some changes to mana handling to handle {C} mana. 2016-01-08 23:25:42 +01:00