mage/Mage.Tests/src
LevelX2 36a48780e4 Merge commit 'b95d7ca705' into Network_Upgrade
Conflicts:
	.gitignore
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Server/src/main/java/mage/server/Session.java
2015-09-27 15:06:14 +02: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 commit 'b95d7ca705' into Network_Upgrade 2015-09-27 15:06:14 +02:00