| commit | 692f34b53696cde8f202a6c66196851e1c9c18c8 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Sat Dec 22 19:40:15 2012 +0100 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Sat Dec 22 19:40:15 2012 +0100 |
| tree | f9e7581257705b48fcd5ec36815f9b9b812c5188 | |
| parent | 7be7da16af5e7a6070f337586a200881bbd413b2 [diff] | |
| parent | 1395ec2269578530aa588c160edbd17ab404a9b8 [diff] |
Merge branch 'master' into multi-monitor Conflicts: include/GL/glfw3.h src/window.c tests/glfwinfo.c