Camilla Berglund 73cdc34df7 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		2012-12-02 20:52:03 +01:00
..
GL	Merge branch 'master' into multi-monitor	2012-12-02 20:52:03 +01:00