From 19de064710c031bf3ea87b577f5c41257d5c62b2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 22 Aug 2014 12:23:43 +0200
Subject: [PATCH] Merge truevfs branch

Conflicts:
	Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
---
 Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
index df65006363..8b1172c92f 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -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;