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	Added sending broadcast message to all users on server from Admin Console.	2012-01-25 19:13:27 +04:00
src/mage	Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade	2015-08-25 14:07:31 -04:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-08-17 09:20:44 -04:00