| commit | 73cdc34df79772af6be456b89b3e07b79013952e | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Sun Dec 02 20:52:03 2012 +0100 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Sun Dec 02 20:52:03 2012 +0100 |
| tree | 06022c0378f596cc75ec385a1012029ac1c39382 | |
| parent | 5f68e12b5237ceafbb090215175bbe1c6846782e [diff] | |
| parent | ccdb776cc34cc5bb368acc2c455ef4cb45e400ae [diff] |
Merge branch 'master' into multi-monitor Conflicts: CMakeLists.txt readme.html src/CMakeLists.txt src/cocoa_platform.h src/win32_platform.h src/x11_platform.h tests/events.c