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
..
assembly	Set *.sh Unix scripts executable by default	2014-01-30 03:13:43 +01:00
java/mage/server	Merge branch 'master' into Network_Upgrade	2015-08-17 09:20:44 -04:00
resources	Some changes to client and server logging messages.	2014-08-04 17:21:14 +02:00
xml-resources/jaxb/Config	added optional SSL encryption	2015-05-28 21:04:53 -04:00