Camilla Berglund 560b6b5a11 Merge branch 'master' into multi-monitor ... Conflicts: src/CMakeLists.txt src/internal.h src/x11_platform.h		2012-08-29 20:36:07 +02:00
..
GL	Merge branch 'master' into multi-monitor	2012-08-29 20:36:07 +02:00