aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPolyFloyd <floyd@polyfloyd.net>2014-05-19 19:38:05 +0200
committerPolyFloyd <floyd@polyfloyd.net>2014-05-19 19:38:05 +0200
commit342050b08bd2d0347bbb6f549a5b79f1269ec6ae (patch)
tree724c8c40387d477e5b864ff1410a34459d36e750
parent7bba4b2697360688e78eca9dc791175926b338da (diff)
downloadgl-342050b08bd2d0347bbb6f549a5b79f1269ec6ae.tar.gz
Add a section describing the glew-1.10 branch
-rw-r--r--.gitignore2
-rw-r--r--README.md9
2 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 4367e33..4dc50e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
**.[o86]
_obj
*_cgo_*
-
+/README.html
diff --git a/README.md b/README.md
index 95fe9e3..f1cc31b 100644
--- a/README.md
+++ b/README.md
@@ -87,12 +87,19 @@ need a C compiler. If you install the GLEW to your compiler's include and lib
directories, things should work. If they do not, please
[contact us](http://go-gl.github.com).
+OpenGL 4.*
+----------
+
+The `glew-1.10` branch is available for those that need newer OpenGL 4.* functionality.
+To use it, manually clone the repository and checkout the branch.
+As the branchname implies, it's using GLEW 1.10.
+
Forward compatibility
---------------------
It is the intent of the `go-gl` authors to keep `gl` and related packages
forward-compatible at both the API/ABI levels _per go release_ so that you can
continue to import from this github repository. Development requiring breakage
-will occur on the `dev` branch, and will be merged with master when a new go
+will occur on the `glew-1.10` branch, and will be merged with master when a new go
version is released.