North 96ff08dc9a Merge branch 'decouple-client' ... Conflicts: Mage/src/mage/cards/repository/CardRepository.java		2013-07-03 21:42:40 +03:00
..
AbilityPicker.java	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
BattlefieldPanel.form	Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert.	2010-10-22 12:40:50 +00:00
BattlefieldPanel.java	[refactor] moved enums from Constants class	2013-06-16 12:28:10 +03:00
CombatGroup.form	Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert.	2010-10-22 12:40:50 +00:00
CombatGroup.java	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
FeedbackPanel.form	Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert.	2010-10-22 12:40:50 +00:00
FeedbackPanel.java	[minor] formatting	2013-04-02 13:46:43 +02:00
GamePane.form	UI fixes - can now play simultaneous games	2011-03-04 22:46:56 -05:00
GamePane.java	Fixed Issue#84: Arrows that show the targets are always on top	2013-01-08 15:58:48 +04:00
GamePanel.form	missed GamePanel	2011-01-24 22:43:22 -05:00
GamePanel.java	Added option to select time limit (also none) on match or tournament creation.	2013-06-21 21:34:06 +02:00
HandPanel.java	[refactor] moved enums from Constants class	2013-06-16 12:28:10 +03:00
HelperPanel.java	Closed #169: Make it possible to untap lands	2013-03-29 20:35:16 +04:00
ManaPool.form	Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert.	2010-10-22 12:40:50 +00:00
ManaPool.java	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
PlayAreaPanel.form	Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert.	2010-10-22 12:40:50 +00:00
PlayAreaPanel.java	Added a quit match option. FFA game gets no more killed if host left mage or quitted match.	2013-07-02 22:15:49 +02:00
PlayerPanel.form	rolled back changes since 0.7.3 R2 - going to switch client/server architecture	2011-06-14 23:09:18 -04:00
PlayerPanel.java	[refactoring][minor] Replaced all tabs with four spaces.	2012-06-19 23:50:20 +03:00
PlayerPanelExt.java	Merge remote-tracking branch 'origin/master' into decouple-client	2013-06-30 11:26:40 +03:00