mage/Mage.Client
betasteward 5c829b79d5 Merge branch 'master' into Network_Upgrade
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
2015-07-12 12:25:44 -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 Update to release 1.4.1. 2015-06-14 02:43:16 +02:00
sounds Readded unintended deleted wav file. 2014-12-13 17:57:44 +01:00
src Merge branch 'master' into Network_Upgrade 2015-07-12 12:25:44 -04:00
manifest.mf updated poms with new version 2010-12-21 23:25:54 -05:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-07-12 12:25:44 -04:00
serverlist.txt Some minor changes. 2015-07-08 22:51:31 +02:00
splash.jpg Updated splash image 2012-06-26 15:38:08 +04:00