betasteward 5c829b79d5 Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java Mage.Client/src/main/java/mage/client/game/GamePanel.java Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java Mage.Server/src/main/java/mage/server/Session.java Mage.Server/src/main/java/mage/server/User.java Mage.Server/src/main/java/mage/server/game/GameController.java Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java		2015-07-12 12:25:44 -04:00
..
src/mage	Merge branch 'master' into Network_Upgrade	2015-07-12 12:25:44 -04:00
manifest.mf
pom.xml	XMage Release 1.4.2v0	2015-07-04 01:28:19 +02:00