Commit Graph

60 Commits

Author SHA1 Message Date
Camilla Berglund
854e634fec Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/fullscreen.c
	src/internal.h
	src/win32_fullscreen.c
	src/win32_platform.h
	src/x11_fullscreen.c
	tests/modes.c
2012-08-03 02:57:33 +02:00
Camilla Berglund
c68a4aa2ef Formatting. 2012-07-06 17:47:09 +02:00
Camilla Berglund
e188f6c4e1 Replaced manual duplication with strdup. 2012-07-06 14:37:02 +02:00
Camilla Berglund
73622a2f3c Formatting. 2012-07-06 14:36:29 +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
Marcel Metz
f228d23024 Moved platform specific monitor list creation part to separate functions. 2012-01-30 12:33:32 +01:00
Marcel Metz
6f970f5753 Made monitor list cleanup shared. 2012-01-30 12:04:16 +01:00
Camilla Berglund
1036d8e808 Restored dropped guards for RandR-specific function. 2011-10-06 23:53:11 +02:00
Camilla Berglund
9738728298 Reshuffling, formatting and shortening. 2011-10-06 23:28:56 +02:00
Marcel Metz
29a4eca87d Renamed monitor related files. 2011-10-03 14:22:06 -04:00