LevelX2 ad9f325b72 Merge origin/master into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/MageFrame.java Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java Mage.Common/src/mage/view/UserDataView.java		2015-08-27 15:23:31 +02: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 origin/master into Network_Upgrade	2015-08-27 15:23:31 +02:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-08-17 09:20:44 -04:00