From 4081943614bd43327078feca18e7fe392931ac98 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sat, 18 Jun 2011 16:43:07 +0000
Subject: [PATCH] changing package. argh.

---
 .../opengl/src/processing/{opengl2 => opengl}/PFontTexture.java | 2 +-
 .../opengl/src/processing/{opengl2 => opengl}/PFramebuffer.java | 2 +-
 .../src/processing/{opengl2 => opengl}/PGraphicsOpenGL2.java    | 2 +-
 .../opengl/src/processing/{opengl2 => opengl}/PShape3D.java     | 2 +-
 .../opengl/src/processing/{opengl2 => opengl}/PTexture.java     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename java/libraries/opengl/src/processing/{opengl2 => opengl}/PFontTexture.java (99%)
 rename java/libraries/opengl/src/processing/{opengl2 => opengl}/PFramebuffer.java (99%)
 rename java/libraries/opengl/src/processing/{opengl2 => opengl}/PGraphicsOpenGL2.java (99%)
 rename java/libraries/opengl/src/processing/{opengl2 => opengl}/PShape3D.java (96%)
 rename java/libraries/opengl/src/processing/{opengl2 => opengl}/PTexture.java (96%)

diff --git a/java/libraries/opengl/src/processing/opengl2/PFontTexture.java b/java/libraries/opengl/src/processing/opengl/PFontTexture.java
similarity index 99%
rename from java/libraries/opengl/src/processing/opengl2/PFontTexture.java
rename to java/libraries/opengl/src/processing/opengl/PFontTexture.java
index fcd4e3cca..005c92a1f 100644
--- a/java/libraries/opengl/src/processing/opengl2/PFontTexture.java
+++ b/java/libraries/opengl/src/processing/opengl/PFontTexture.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.opengl2;
+package processing.opengl;
 
 import java.util.HashMap;
 import processing.core.PApplet;
diff --git a/java/libraries/opengl/src/processing/opengl2/PFramebuffer.java b/java/libraries/opengl/src/processing/opengl/PFramebuffer.java
similarity index 99%
rename from java/libraries/opengl/src/processing/opengl2/PFramebuffer.java
rename to java/libraries/opengl/src/processing/opengl/PFramebuffer.java
index 74a015adf..e32a8b3c3 100644
--- a/java/libraries/opengl/src/processing/opengl2/PFramebuffer.java
+++ b/java/libraries/opengl/src/processing/opengl/PFramebuffer.java
@@ -20,7 +20,7 @@
  Boston, MA  02111-1307  USA
  */
 
-package processing.opengl2;
+package processing.opengl;
 
 import java.nio.IntBuffer;
 import javax.media.opengl.GL;
diff --git a/java/libraries/opengl/src/processing/opengl2/PGraphicsOpenGL2.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL2.java
similarity index 99%
rename from java/libraries/opengl/src/processing/opengl2/PGraphicsOpenGL2.java
rename to java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL2.java
index 31fceb6c4..ecf273ea8 100644
--- a/java/libraries/opengl/src/processing/opengl2/PGraphicsOpenGL2.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL2.java
@@ -21,7 +21,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.opengl2;
+package processing.opengl;
 
 import processing.core.*;
 
diff --git a/java/libraries/opengl/src/processing/opengl2/PShape3D.java b/java/libraries/opengl/src/processing/opengl/PShape3D.java
similarity index 96%
rename from java/libraries/opengl/src/processing/opengl2/PShape3D.java
rename to java/libraries/opengl/src/processing/opengl/PShape3D.java
index a1579b736..5221f6c6b 100644
--- a/java/libraries/opengl/src/processing/opengl2/PShape3D.java
+++ b/java/libraries/opengl/src/processing/opengl/PShape3D.java
@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.opengl2;
+package processing.opengl;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
diff --git a/java/libraries/opengl/src/processing/opengl2/PTexture.java b/java/libraries/opengl/src/processing/opengl/PTexture.java
similarity index 96%
rename from java/libraries/opengl/src/processing/opengl2/PTexture.java
rename to java/libraries/opengl/src/processing/opengl/PTexture.java
index 46e44f8c3..33f10dac3 100644
--- a/java/libraries/opengl/src/processing/opengl2/PTexture.java
+++ b/java/libraries/opengl/src/processing/opengl/PTexture.java
@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.opengl2;
+package processing.opengl;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;