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
..
ai.please.cast.this.txt.example	Added the possibility to force AI to play cards in cheat mode.	2011-10-19 19:13:51 +04:00
config.xml	Merge branch 'master' into Network_Upgrade	2015-06-30 23:13:29 -04:00
init.txt.example	test commit	2012-01-20 01:13:50 +04:00
log4j.properties	Some changes to client and server logging messages.	2014-08-04 17:21:14 +02:00
logging.properties	fixed issue 25 - server waits for all clients to confirm initialization before starting game	2010-11-30 04:35:26 +00:00
security.policy	...	2010-03-21 04:05:33 +00:00