Fixed merge errors

Cube Control/frame.java

@@ -53,7 +53,7 @@ class Led3D {
   private Vector3d lookVect = new Vector3d(1.0, 1.0, 0.0);
 
   Led3D(Canvas3D canv) {
-  
+
     canvas = canv;
     group = new BranchGroup();
     // Position viewer, so we are looking at object

Cube Control/makefile

@@ -10,9 +10,8 @@ else
 JAVAFILES = *.java
 endif
 
-# Windows doesn't like *.class, so we have to maintain a list of all classes :(
 ifeq ($(TARGET),win)
-INJAR = cubeWorker.class layerEditFrame.class layerEditFrame$$1.class layerEditFrame$$2.class layerEditFrame$$3.class layerEditFrame$$4.class frame.class frame$$1.class frame$$2.class frame$$3.class frame$$4.class frame$$5.class frame$$6.class frame$$7.class frame$$8.class frame$$9.class frame$$10.class frame$$11.class frame$$12.class frame$$13.class frame$$14.class frame$$15.class frame$$16.class frame$$17.class frame$$18.class frame$$19.class frame$$20.class frame$$21.class frame$$22.class frame$$23.class frame$$24.class AFrame.class Animation.class AnimationUtility.class HelperUtility.class Led3D.class LEDoff.png LEDon.png serialHelper.exe
+INJAR = *.class *.png serialHelper.exe
 else
 INJAR = *.class *.png serialHelper
 endif