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
..
config	cleanup config settings and files	2015-08-24 10:57:40 -04:00
release	cleanup config settings and files	2015-08-24 10:57:40 -04:00
src/main	Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade	2015-08-25 14:07:31 -04:00
catalog.xml	Initial	2010-03-20 03:44:53 +00:00
license.txt	...	2010-03-20 17:39:52 +00:00
manifest.mf	Initial	2010-03-20 03:44:53 +00:00
pom.xml	cleanUp	2015-08-19 11:05:33 -04:00
server.msg.txt	Xmage 1.4.3v0	2015-08-06 23:11:36 +02:00