Merge branch 'master' into multi-monitor

Conflicts:
	src/x11_window.c
This commit is contained in:
Camilla Berglund
2012-09-23 15:26:53 +02:00
4 changed files with 4 additions and 1 deletions
+1
View File
@@ -853,6 +853,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if (wndconfig->mode == GLFW_FULLSCREEN)
{
_glfwPlatformShowWindow(window);
enterFullscreenMode(window);
}