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	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
src	Merge branch 'master' into Network_Upgrade	2015-06-30 23:13:29 -04:00
CommanderDuel.dck	Added commander duel test base class.	2015-05-29 15:07:16 +02:00
CommanderDuel_UW.dck	Added possibility to set a specific deck for a test.	2015-06-14 23:23:26 +02:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-06-20 23:00:34 -04:00
RB Aggro.dck	Various fixed. +3 tests passed.	2012-05-24 00:24:01 +04:00
UW Control.dck	Added Mage.Tests project. Update server for test operations. Implemented bdd classes.	2010-12-20 01:03:12 +03:00