betasteward d9f1d71d98 Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java Mage.Client/src/main/java/mage/client/table/TablesPanel.java Mage.Common/src/mage/view/CardView.java		2015-08-17 09:20:44 -04:00
..
config.xml	Merge branch 'master' into Network_Upgrade	2015-08-17 09:20:44 -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