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
..
frozen/org/mage/test/clientside	* Redesigned idle timeout handling to prevent selecting wrong player for timeout.	2014-12-27 17:31:52 +01:00
test	Merge branch 'master' into Network_Upgrade	2015-06-20 23:00:34 -04:00