1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Commit Graph

20 Commits

Author SHA1 Message Date
Camilla Berglund 830f2b439c Cleanup. 2012-09-12 20:41:14 +02:00
Camilla Berglund 39c171a61d Merge branch 'master' into multi-monitor
Conflicts:
	tests/modes.c
2012-08-14 14:02:37 +02:00
Camilla Berglund 6399fb19fd Included malloc.h from files using malloc on Win32. 2012-08-14 13:52:48 +02:00
Camilla Berglund c06f838d88 Merge branch 'master' into multi-monitor
Conflicts:
	.gitignore
	examples/CMakeLists.txt
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/internal.h
	src/win32_platform.h
	src/win32_window.c
	src/x11_fullscreen.c
	src/x11_platform.h
	tests/listmodes.c
2012-07-05 16:15:01 +02:00
Camilla Berglund 20fccd4aa3 Removed unsupported target. 2012-05-24 11:48:50 +02:00
Camilla Berglund 79bef68511 Only restore gamma ramp if it has been changed. 2012-05-24 11:46:51 +02:00
Camilla Berglund 2753577dbd Removed dynamic loading of gdi32. 2012-03-30 02:28:15 +02:00
Camilla Berglund 2588c9be17 Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL. 2012-03-25 17:40:30 +02:00
Camilla Berglund 8d2c2791c2 Added initial Linux MinGW-w64 support. 2012-03-22 16:57:38 +01:00
Camilla Berglund ca9633247b Merge branch 'master' of github.com:elmindreda/glfw
Conflicts:
	src/win32_window.c
2012-02-07 15:43:29 +01:00
Camilla Berglund 84579305cb Made string conversions globally available. 2012-02-05 02:07:50 +01:00
Camilla Berglund 6b98a04d17 Merge branch 'utf8' into multi-monitor
Conflicts:
	src/CMakeLists.txt
2012-02-04 20:12:28 +01:00
Camilla Berglund 9c0c2c6b08 Upgraded Win32 port to Unicode mode. 2012-02-03 20:34:24 +01:00
Marcel Metz c7a5474bfc Merged with master. 2012-01-24 18:00:51 +01:00
Camilla Berglund 379d0025ec Removed library name from version string to more closely match OpenGL format. 2012-01-18 18:15:28 +01:00
Marcel Metz ac57be060d Merge branch 'master' into multi-display-support
Conflicts:
	src/fullscreen.c
	src/win32_window.c
	src/x11_fullscreen.c
2011-10-07 00:35:37 -04:00
Marcel Metz 426df42d00 Replaced display with monitor in monitor related api. 2011-10-03 03:24:35 -04:00
Marcel Metz a905e671b3 Implemented display iteration for win32 platform. 2011-10-02 16:47:15 -04:00
Tai Chi Minh Ralph Eastwood 5ac752d79d Set the current gamma ramp to original gamma ramp at start. 2011-09-25 15:00:08 +01:00
Camilla Berglund 0f93e8f252 Flattened source tree. 2011-07-26 15:16:34 +02:00