github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
mage/Mage
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
..
src Merge remote-tracking branch 'magefree/master' 2016-09-03 20:06:33 -04:00
manifest.mf
pom.xml Xmage 1.4.14v0 2016-08-13 10:14:38 +02:00