| commit | 9d6945a7668c19c628b57dd67f234a3e07d48f0e | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Sun Sep 23 15:35:45 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Sun Sep 23 15:35:45 2012 +0200 |
| tree | 25d6a1b48979016e72b3ad505ab8e33e82d993a4 | |
| parent | 0272ce2e98bdf1ac6b6e17266a4293aecba06fdf [diff] | |
| parent | c0dcb5a056eb0433cc6dc4a9d22c0d00eb4b1bd0 [diff] |
Merge branch 'master' into EGL Conflicts: CMakeLists.txt include/GL/glfw3.h readme.html src/CMakeLists.txt src/internal.h src/window.c