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 optional SSL encryption	2015-05-28 21:04:53 -04:00
release	* Some more fixes to the name Shadowmoor.	2015-05-04 11:12:47 +02:00
src/main	Merge branch 'master' into Network_Upgrade	2015-06-12 08:56:26 -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	initial commit - only table pane chat is working atm	2015-05-23 10:18:36 -04:00
server.msg.txt	* Update to version 1.4.0v0.	2015-05-12 23:11:25 +02:00