diff options
| author | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-29 04:51:49 +0200 |
| commit | cabb7585626b774065c44b70aeabb1f2efe46a4e (patch) | |
| tree | b74d21549ae24b77483101964484e5e1b88e38c4 /src/java/com/sun/gluegen/opengl | |
| parent | 0cb8a2141f57cd0a3a36a1f884a307c9b5d17da4 (diff) | |
| parent | b67f833f1ea5f7a271323e914d412d2939babca9 (diff) | |
Resolved conflicts
Diffstat (limited to 'src/java/com/sun/gluegen/opengl')
| -rwxr-xr-x | src/java/com/sun/gluegen/opengl/GLConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/sun/gluegen/opengl/GLConfiguration.java b/src/java/com/sun/gluegen/opengl/GLConfiguration.java index 19cf85a74..6d08a10a2 100755 --- a/src/java/com/sun/gluegen/opengl/GLConfiguration.java +++ b/src/java/com/sun/gluegen/opengl/GLConfiguration.java @@ -173,7 +173,7 @@ public class GLConfiguration extends ProcAddressConfiguration { if (emitter.isBufferObjectMethodBinding(binding)) { for (Iterator<String> iter = res.iterator(); iter.hasNext(); ) { String line = iter.next(); - if (line.indexOf("BufferFactory.rangeCheck") >= 0) { + if (line.indexOf("Buffers.rangeCheck") >= 0) { iter.remove(); } } |