mage/Mage.Server
LevelX2 c8b092c758 Merge commit 'b95d7ca705' into Network_Upgrade
Conflicts:
	.gitignore
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Server/src/main/java/mage/server/Session.java
2015-09-27 15:08:43 +02:00
..
config Merge commit 'b95d7ca705' into Network_Upgrade 2015-09-27 15:06:14 +02:00
release Merge commit 'b95d7ca705' into Network_Upgrade 2015-09-27 15:06:14 +02:00
src/main Merge commit 'b95d7ca705' into Network_Upgrade 2015-09-27 15:08:43 +02:00
catalog.xml Initial 2010-03-20 03:44:53 +00:00
license.txt ... 2010-03-20 17:39:52 +00:00
manifest.mf Initial 2010-03-20 03:44:53 +00:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00
server.msg.txt Xmage 1.4.3v0 2015-08-06 23:11:36 +02:00