[libbluray-devel] Removed merge leftovers

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Mar 19 21:12:32 2014 +0200| [e512e8e475cfbc6ede464e0960b21b7b6c4ad9ae] | committer: hpi1

Removed merge leftovers

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=e512e8e475cfbc6ede464e0960b21b7b6c4ad9ae
---

 src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java |    2 --
 src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java |    5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java b/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
index 2fd0be0..8bde555 100644
--- a/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
+++ b/src/libbluray/bdj/java-j2me/java/awt/BDGraphicsConfiguration.java
@@ -20,8 +20,6 @@
 package java.awt;
 
 class BDGraphicsConfiguration extends BDGraphicsConfigurationBase {
-    private BDGraphicsDevice device;
-
     BDGraphicsConfiguration(BDGraphicsDevice device) {
         super(device);
     }
diff --git a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
index e8d47ed..3c1b1ba 100644
--- a/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
+++ b/src/libbluray/bdj/java-j2se/java/awt/BDGraphicsConfiguration.java
@@ -19,11 +19,6 @@
 
 package java.awt;
 
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DirectColorModel;
 import java.awt.image.VolatileImage;
 
 class BDGraphicsConfiguration extends BDGraphicsConfigurationBase {