External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage
History
betasteward 1e60605d84 Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/cards/Card.java
	Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
2015-08-25 14:07:31 -04:00
..
src/mage Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade 2015-08-25 14:07:31 -04:00
manifest.mf
pom.xml Xmage 1.4.3v0 2015-08-06 22:18:01 +02:00