betasteward 49558e091d Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java Mage.Client/src/main/java/mage/client/game/GamePanel.java Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java		2015-09-10 10:30:51 -04:00
..
src	Merge branch 'master' into Network_Upgrade	2015-07-12 12:25:44 -04:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-09-10 10:30:51 -04:00