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.xml	Merge branch 'master' into Network_Upgrade	2015-09-10 10:30:51 -04:00
log4j.properties	Some changes to client and server logging messages.	2014-08-04 17:21:14 +02:00
logging.properties	...	2010-05-04 02:13:07 +00:00
security.policy	...	2010-03-22 01:03:17 +00:00