Camilla Berglund 83f5b920b9 Merge branch 'master' into multi-monitor ... Conflicts: .gitignore src/CMakeLists.txt src/x11_window.c		2012-09-12 06:04:17 +02:00
..
glfw3.h	Merge branch 'master' into multi-monitor	2012-09-12 06:04:17 +02:00
glfw3native.h	Added explicit access to native handles.	2012-07-22 15:26:15 +02:00