|  Camilla Berglund | 85cfc6bdd0 | Merge branch 'master' into joystickname Conflicts:
	src/x11_joystick.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 9d6945a766 | Merge branch 'master' into EGL Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/internal.h
	src/window.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 7aaeb6955b | Merge branch 'master' into multi-monitor Conflicts:
	src/x11_window.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | c0dcb5a056 | Fixed fullscreen regressions. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 6a5ebbc870 | Merge branch 'master' into multi-monitor | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 718af531a3 | Fixed order of operations. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | d6d5fb2684 | Simplified character input. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 14f00ffa67 | Removed unused struct member. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | b711b2fc72 | Formatting. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | a2dab25b06 | Added fallback for X11 monitor size. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 1027935cdf | Merge branch 'master' of github.com:elmindreda/glfw | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | dbd4d1657e | Formatting. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 20a49a7eee | Improved handling of primary monitor. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 89018331f7 | Fixed invalid uses of glfwDestroyWindow. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | d21e79642b | Added output of monitor position. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | a0305affeb | Began implementing multi-monitor on Cocoa. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 633839502c | Fixed various VC++ warnings. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 5bbbf8640e | Formatting. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | b4493dd3bc | Removed paranoid error check. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 4f8f6c7d89 | Fixed monitor enumeration on Win32. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | f6ba959b1b | Moved threads package to X11 block. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | d3a2d268f6 | Merge branch 'master' into multi-monitor | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | d5e4204ed1 | POSIX threads should not be preferred on Win32. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 1071966d55 | Merge branch 'master' into multi-monitor Conflicts:
	src/CMakeLists.txt
	src/fullscreen.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 4408d2134c | Added use of standard lParam macros. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 18392837ac | Formatting. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 1d6d6bc3c6 | Moved display closing to after GL terminate. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | c4d5da0090 | Moved DllMain into Win32 init module. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 6ac58da26e | Narrowed criteria for non-standard inclusion. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 4bcb1b38f9 | Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 55419bda67 | Merged fullscreen and monitor modules. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | c87829ea61 | Added allocation failure check. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | ea664c8a39 | Added comments. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | c83b336a4c | Formatting. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | fa4f6b43f6 | Added monitor stubs for Cocoa. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 830f2b439c | Cleanup. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 83f5b920b9 | Merge branch 'master' into multi-monitor Conflicts:
	.gitignore
	src/CMakeLists.txt
	src/x11_window.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 64c677be9e | Renamed config macro to match convention. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | e15e92b583 | Fixed function grouping. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 0e2b12be43 | Corrected comment. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 023b816bcc | Disallowed hiding of fullscreen windows. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | d214bfdfde | Made defaults test window hidden. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | dcc3d67158 | Merge branch 'showwindow' | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 7be55239e7 | Disabled native API by default. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 0272ce2e98 | Merge branch 'master' into EGL Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 7493bbe0c8 | Removed X11 prefix from EGL and GLX files. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 74488bec67 | Further isolated X11-specific parts of EGL code. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | 0ca1e67d7a | Moved X11-specific defines to X11 header. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | dd69985649 | Fixed API error tags. | ago%!(EXTRA string=13 years) | 
				
					
						|  Camilla Berglund | feef05f839 | Removed superfluous inclusion. | ago%!(EXTRA string=13 years) |