Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	src/window.c
This commit is contained in:
Camilla Berglund
2012-09-27 23:32:26 +02:00
parent 1be1636326 410a4e29e1
commit 508c7fe0e6
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/window.c
+1 -1
View File
@@ -269,7 +269,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
wndconfig.glProfile = _glfwLibrary.hints.glProfile;
wndconfig.glRobustness = _glfwLibrary.hints.glRobustness ? GL_TRUE : GL_FALSE;
wndconfig.monitor = (_GLFWmonitor*) monitor;
wndconfig.share = share;
wndconfig.share = (_GLFWwindow*) share;
// Reset to default values for the next call
_glfwSetDefaultWindowHints();