betasteward 88e30ee6e1 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/PreferencesDialog.java Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java Mage.Client/src/main/java/mage/client/game/GamePanel.java Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java Mage.Client/src/main/java/mage/client/tournament/TournamentPanel.java Mage.Common/src/mage/interfaces/MageServer.java Mage.Common/src/mage/remote/Connection.java Mage.Common/src/mage/remote/SessionImpl.java Mage.Server/src/main/java/mage/server/MageServerImpl.java Mage.Server/src/main/java/mage/server/Session.java Mage.Server/src/main/java/mage/server/SessionManager.java Mage.Server/src/main/java/mage/server/TableController.java Mage.Server/src/main/java/mage/server/User.java Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java Mage.Server/src/main/java/mage/server/tournament/TournamentController.java		2015-06-30 23:13:29 -04:00
..
config	Merge branch 'master' into Network_Upgrade	2015-06-30 23:13:29 -04:00
release	Added Holiday Cube 2015	2015-06-23 00:50:14 -05:00
src/main	Merge branch 'master' into Network_Upgrade	2015-06-30 23:13:29 -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