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	* Server list - Added pref configuration for server list URL. Server list will now be saved to client dir and used if configured URL is not reachable.	2014-11-21 15:42:13 +01:00
plugins	adjust path of sounds and music	2013-07-12 16:57:58 -04:00
release	fixed EOL character for non-windows scripts	2015-08-18 21:08:09 -04:00
sounds	Sounds Update	2015-08-12 12:52:41 -04:00
src	Merge branch 'master' into Network_Upgrade	2015-09-10 10:30:51 -04:00
manifest.mf
pom.xml	Merge branch 'master' into Network_Upgrade	2015-09-10 10:30:51 -04:00
serverlist.txt	Xmage 1.4.3v3	2015-08-21 09:49:53 +02:00
splash.jpg	Updated splash image	2012-06-26 15:38:08 +04:00