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 | 69fe372b874d913e2d1c27f1d103e1fced668ecf (patch) | |
| tree | cf402337903ba3d02bbab628f2f82a23908a5f11 /src/java/com/sun/gluegen/opengl | |
| parent | 2138fc787c1e497be7f373aa68b3f751c955008f (diff) | |
| parent | 2d76c16b9384d383d3e6a9d7cb727f2591a39228 (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 19cf85a..6d08a10 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(); } } |