betasteward 38da157f8c Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/MageFrame.java Mage.Client/src/main/java/mage/client/chat/ChatPanel.java Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java Mage.Client/src/main/java/mage/client/dialog/UserRequestDialog.java Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java Mage.Client/src/main/java/mage/client/table/TablesPanel.java Mage.Common/src/mage/remote/SessionImpl.java Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java		2015-06-12 08:56:26 -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' into Network_Upgrade	2015-06-12 08:56:26 -04:00
pom.xml	* Update to version 1.4.0v0.	2015-05-12 23:11:25 +02:00