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
..
config	Merge branch 'master' into Network_Upgrade	2015-06-30 23:13:29 -04:00
release	Fixed wrong type name in config.xml	2015-07-07 07:55:16 +02:00
src/main	Merge branch 'master' into Network_Upgrade	2015-07-12 12:25:44 -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-07-12 12:25:44 -04:00
server.msg.txt	* Fixed exile and return back under owner control handling (e.g. Norin the Wary did not return from command zone when commander replacement effect was used).	2015-07-03 21:08:06 +02:00