| commit | 7be7da16af5e7a6070f337586a200881bbd413b2 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Thu Dec 13 02:23:38 2012 +0100 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Thu Dec 13 02:23:38 2012 +0100 |
| tree | 91cb7d6c4a480aeecc9b14f79adb95a23da2f79a | |
| parent | 052c587dd5c3381fb36fe169ea76de7c4dccb520 [diff] | |
| parent | 3f5843f5007043b4d02d74d5cf88826aa05419e4 [diff] |
Merge branch 'master' into multi-monitor Conflicts: include/GL/glfw3.h