| commit | 835f00eb10334eb66ac3c2588c8c215d3401607d | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Mon Dec 31 21:13:10 2012 +0100 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Mon Dec 31 21:13:10 2012 +0100 |
| tree | 47dad543c665af6682ae9ede4b9b90572c2177cd | |
| parent | 02598570cb4c83a584021b6e47e05375adac6502 [diff] | |
| parent | 1790194828222dd2f823db10f6e53ecca4278dc7 [diff] |
Merge branch 'master' into multi-monitor Conflicts: include/GL/glfw3.h readme.html src/fullscreen.c src/internal.h src/window.c src/x11_fullscreen.c