github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge truevfs branch

Browse source 
Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
This commit is contained in:
LevelX2 2014-08-22 12:23:43 +02:00
parent 3757a4a6c9
commit 19de064710
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -1,6 +1,5 @@
package org.mage.card.arcane;
import de.schlichtherle.truezip.file.TFile;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Dimension;
@ -46,6 +45,7 @@ import mage.view.CardView;
import mage.view.CounterView;
import mage.view.PermanentView;
import mage.view.StackAbilityView;
import net.java.truevfs.access.TFile;
import org.apache.log4j.Logger;
import org.mage.card.arcane.ScaledImagePanel.MultipassType;
import org.mage.card.arcane.ScaledImagePanel.ScalingType;