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
..
config	cleanup config settings and files	2015-08-24 10:57:40 -04:00
src/test/java/org/mage/server/test	fixed issues with ConnectionLoadTest	2015-09-02 12:52:37 -04:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-09-10 10:30:51 -04:00
server.msg.txt	add server.msg.txt	2015-06-20 10:10:38 -04:00
TestDeck.dck	added more tests	2015-06-23 21:45:58 -04:00