betasteward f4aff4a121 Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/chat/ChatPanel.java Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.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/Session.java		2015-06-20 23:00:34 -04:00
..
config	added optional SSL encryption	2015-05-28 21:04:53 -04:00
release	Update to release 1.4.1.	2015-06-14 02:43:16 +02:00
src/main	Merge branch 'master' into Network_Upgrade	2015-06-20 23:00:34 -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	Merge branch 'master' into Network_Upgrade	2015-06-20 23:00:34 -04:00
server.msg.txt	Update to release 1.4.1.	2015-06-14 02:43:16 +02:00