Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							7c426d1c92 
							
						 
					 
					
						
						
							
							Merge branch 'master' into multi-monitor  
						
						 
						
						... 
						
						
						
						Conflicts:
	examples/wave.c
	src/init.c
	src/internal.h
	src/window.c
	tests/accuracy.c
	tests/events.c
	tests/reopen.c 
						
					 
					
						2012-11-01 00:07:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							18d71c2b6d 
							
						 
					 
					
						
						
							
							Made window-related callbacks per-window.  
						
						 
						
						... 
						
						
						
						This makes polymorphic behaviour easier to implement and avoids the problem of
events being triggered before the GLFW window object is fully usable. 
						
					 
					
						2012-10-29 13:36:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							5df4df6ca4 
							
						 
					 
					
						
						
							
							Added glfwDefaultWindowHints.  
						
						 
						
						
						
					 
					
						2012-10-22 03:16:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2108360671 
							
						 
					 
					
						
						
							
							Removed 'screen' from monitor nomenclature.  
						
						 
						
						
						
					 
					
						2012-10-22 02:39:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							da31167193 
							
						 
					 
					
						
						
							
							Renamed glfwGetMonitorString to glfwGetMonitorName.  
						
						 
						
						
						
					 
					
						2012-10-18 23:01:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							26480901fd 
							
						 
					 
					
						
						
							
							Added glfwGetWindowMonitor.  
						
						 
						
						
						
					 
					
						2012-10-02 17:24:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							ff09d3a343 
							
						 
					 
					
						
						
							
							Merge branch 'master' into multi-monitor  
						
						 
						
						
						
					 
					
						2012-10-02 03:11:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							38cad9aff0 
							
						 
					 
					
						
						
							
							Added client API window hint.  
						
						 
						
						... 
						
						
						
						This is cherry-picked from the EGL branch in preparation for the EGL backend. 
						
					 
					
						2012-09-30 15:32:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							508c7fe0e6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into multi-monitor  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/window.c 
						
					 
					
						2012-09-27 23:32:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							410a4e29e1 
							
						 
					 
					
						
						
							
							Moved from gl3.h to glcorearb.h.  
						
						 
						
						
						
					 
					
						2012-09-27 22:28:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							1be1636326 
							
						 
					 
					
						
						
							
							Begun integrating monitor and window.  
						
						 
						
						
						
					 
					
						2012-09-27 21:38:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							830f2b439c 
							
						 
					 
					
						
						
							
							Cleanup.  
						
						 
						
						
						
					 
					
						2012-09-12 20:41:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							9a183090e0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into showwindow  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/window.c 
						
					 
					
						2012-09-06 15:11:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							a339098bc0 
							
						 
					 
					
						
						
							
							Formatting.  
						
						 
						
						
						
					 
					
						2012-09-02 15:22:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							89b42d084d 
							
						 
					 
					
						
						
							
							Replaced glfwGetDesktopMode with glfwGetVideoMode.  
						
						 
						
						
						
					 
					
						2012-08-30 01:54:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ce920191 
							
						 
					 
					
						
						
							
							Formatting.  
						
						 
						
						
						
					 
					
						2012-08-29 20:39:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							560b6b5a11 
							
						 
					 
					
						
						
							
							Merge branch 'master' into multi-monitor  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/CMakeLists.txt
	src/internal.h
	src/x11_platform.h 
						
					 
					
						2012-08-29 20:36:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2502e4d6f3 
							
						 
					 
					
						
						
							
							Renamed glfwGetJoystickPos to glfwGetJoystickAxes.  
						
						 
						
						
						
					 
					
						2012-08-29 18:58:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							d0ad28f174 
							
						 
					 
					
						
						
							
							Merge branch 'master' into showwindow  
						
						 
						
						
						
					 
					
						2012-08-28 17:52:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							f637722fa1 
							
						 
					 
					
						
						
							
							Removed MinGW-w64 hack.  
						
						 
						
						
						
					 
					
						2012-08-27 02:40:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							8bb5c59d2d 
							
						 
					 
					
						
						
							
							Added GLFW_VISIBLE window hint and parameter.  
						
						 
						
						
						
					 
					
						2012-08-21 21:19:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							a2ca095b86 
							
						 
					 
					
						
						
							
							Renamed GLFW_WINDOW_RESIZABLE to GLFW_RESIZABLE.  
						
						 
						
						... 
						
						
						
						This matches GLFW_ACTIVE and GLFW_ICONIFIED. 
						
					 
					
						2012-08-21 20:28:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Riku Salminen 
							
						 
					 
					
						
						
						
						
							
						
						
							596132c3a1 
							
						 
					 
					
						
						
							
							Add glfwShowWindow, glfwHideWindow  
						
						 
						
						... 
						
						
						
						Add glfwShowWindow and glfwHideWindow functions to allow explicit
control over show/hide window.
Remove platform specific show window code from _glfwPlatformCreateWindow
but call glfwShowWindow from glfwCreateWindow to avoid breaking things
(for now). 
						
					 
					
						2012-08-21 21:01:57 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2b0f8c2f1e 
							
						 
					 
					
						
						
							
							Removed 'device' from monitor callback.  
						
						 
						
						
						
					 
					
						2012-08-14 15:15:51 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							2410e2aaf4 
							
						 
					 
					
						
						
							
							Replaced automatic closing with window parameter.  
						
						 
						
						
						
					 
					
						2012-08-10 13:31:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2212cd94bf 
							
						 
					 
					
						
						
							
							Moved glfwWindowHint to the top of its block.  
						
						 
						
						
						
					 
					
						2012-08-10 13:29:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							ddcf5d471e 
							
						 
					 
					
						
						
							
							Removed mirroring of default framebuffer attribs.  
						
						 
						
						
						
					 
					
						2012-08-10 13:28:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							585a840329 
							
						 
					 
					
						
						
							
							Added window parameter to glfwSwapBuffers.  
						
						 
						
						
						
					 
					
						2012-08-06 18:13:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							aff30d0baa 
							
						 
					 
					
						
						
							
							Renamed window creation/destruction functions.  
						
						 
						
						... 
						
						
						
						Renamed glfwOpenWindow to glfwCreateWindow.
Renamed glfwCloseWindow to glfwDestroyWindow.
Renamed glfwOpenWindowHint to glfwWindowHint. 
						
					 
					
						2012-08-06 17:59:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2972cdfeb1 
							
						 
					 
					
						
						
							
							Removed glfwIsWindow.  
						
						 
						
						
						
					 
					
						2012-08-03 16:20:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							3c912cbc3c 
							
						 
					 
					
						
						
							
							Replaced declaration of wchar_t with stddef.h header.  
						
						 
						
						
						
					 
					
						2012-08-02 21:25:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							871e1a70d7 
							
						 
					 
					
						
						
							
							Made video mode retrieval dynamic.  
						
						 
						
						
						
					 
					
						2012-08-02 18:03:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							957ecdc9a0 
							
						 
					 
					
						
						
							
							Renamed no current context error to match function.  
						
						 
						
						
						
					 
					
						2012-08-02 15:36:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							3a72f33541 
							
						 
					 
					
						
						
							
							Removed GLFW_ACCELERATED window parameter.  
						
						 
						
						
						
					 
					
						2012-08-02 01:13:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							d83119a874 
							
						 
					 
					
						
						
							
							Added explicit access to native handles.  
						
						 
						
						
						
					 
					
						2012-07-22 15:26:15 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							cef9dea1d2 
							
						 
					 
					
						
						
							
							Unified nomenclature for cursor positions.  
						
						 
						
						
						
					 
					
						2012-06-22 13:57:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2213450840 
							
						 
					 
					
						
						
							
							Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU.  
						
						 
						
						
						
					 
					
						2012-06-05 23:55:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							bf42c3cfbc 
							
						 
					 
					
						
						
							
							Made glfwGetProcAddress return a function pointer.  
						
						 
						
						
						
					 
					
						2012-06-05 00:16:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							88ce656b1e 
							
						 
					 
					
						
						
							
							Removed unused header.  
						
						 
						
						
						
					 
					
						2012-04-13 12:52:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							f868712f02 
							
						 
					 
					
						
						
							
							Simplified clipboard API.  
						
						 
						
						
						
					 
					
						2012-04-12 00:51:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							3bd54e0b60 
							
						 
					 
					
						
						
							
							Added inclusion of declaration of size_t.  
						
						 
						
						
						
					 
					
						2012-04-09 23:55:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							1214fa1157 
							
						 
					 
					
						
						
							
							Formatting.  
						
						 
						
						
						
					 
					
						2012-04-09 16:03:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							bf1ada029b 
							
						 
					 
					
						
						
							
							Added window parameter to clipboard API.  
						
						 
						
						
						
					 
					
						2012-04-09 16:00:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							7044ed6f06 
							
						 
					 
					
						
						
							
							Simplified and made clipboard API more type safe.  
						
						 
						
						
						
					 
					
						2012-04-09 15:54:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							490c472328 
							
						 
					 
					
						
						
							
							Removed unused error.  
						
						 
						
						
						
					 
					
						2012-04-09 15:38:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Camilla Berglund 
							
						 
					 
					
						
						
						
						
							
						
						
							2bc8d442f4 
							
						 
					 
					
						
						
							
							Formatting.  
						
						 
						
						
						
					 
					
						2012-04-09 15:36:39 +02:00