| 
							
							
								 Camilla Berglund | 7aaeb6955b | Merge branch 'master' into multi-monitor Conflicts:
	src/x11_window.c | 2012-09-23 15:26:53 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | c0dcb5a056 | Fixed fullscreen regressions. | 2012-09-23 15:08:43 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 6a5ebbc870 | Merge branch 'master' into multi-monitor | 2012-09-23 14:44:56 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 718af531a3 | Fixed order of operations. | 2012-09-23 14:08:36 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | d6d5fb2684 | Simplified character input. | 2012-09-19 13:17:53 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 14f00ffa67 | Removed unused struct member. | 2012-09-16 12:43:33 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | b711b2fc72 | Formatting. | 2012-09-16 12:42:51 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | a2dab25b06 | Added fallback for X11 monitor size. | 2012-09-13 22:04:01 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 1027935cdf | Merge branch 'master' of github.com:elmindreda/glfw | 2012-09-13 21:58:16 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | dbd4d1657e | Formatting. | 2012-09-13 21:57:42 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 20a49a7eee | Improved handling of primary monitor. | 2012-09-13 17:46:40 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 89018331f7 | Fixed invalid uses of glfwDestroyWindow. | 2012-09-13 17:29:07 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | d21e79642b | Added output of monitor position. | 2012-09-13 16:47:59 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | a0305affeb | Began implementing multi-monitor on Cocoa. | 2012-09-13 16:37:06 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 633839502c | Fixed various VC++ warnings. | 2012-09-13 00:05:54 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 5bbbf8640e | Formatting. | 2012-09-12 23:03:15 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | b4493dd3bc | Removed paranoid error check. | 2012-09-12 23:03:07 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 4f8f6c7d89 | Fixed monitor enumeration on Win32. | 2012-09-12 22:51:55 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | f6ba959b1b | Moved threads package to X11 block. | 2012-09-12 21:54:00 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | d3a2d268f6 | Merge branch 'master' into multi-monitor | 2012-09-12 21:47:04 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | d5e4204ed1 | POSIX threads should not be preferred on Win32. | 2012-09-12 21:46:40 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 1071966d55 | Merge branch 'master' into multi-monitor Conflicts:
	src/CMakeLists.txt
	src/fullscreen.c | 2012-09-12 21:42:21 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 4408d2134c | Added use of standard lParam macros. | 2012-09-12 21:37:36 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 18392837ac | Formatting. | 2012-09-12 21:34:23 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 1d6d6bc3c6 | Moved display closing to after GL terminate. | 2012-09-12 21:25:52 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | c4d5da0090 | Moved DllMain into Win32 init module. | 2012-09-12 21:23:04 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 6ac58da26e | Narrowed criteria for non-standard inclusion. | 2012-09-12 21:18:59 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 4bcb1b38f9 | Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor | 2012-09-12 21:14:15 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 55419bda67 | Merged fullscreen and monitor modules. | 2012-09-12 21:04:24 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | c87829ea61 | Added allocation failure check. | 2012-09-12 20:54:45 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | ea664c8a39 | Added comments. | 2012-09-12 20:54:12 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | c83b336a4c | Formatting. | 2012-09-12 20:53:57 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | fa4f6b43f6 | Added monitor stubs for Cocoa. | 2012-09-12 20:44:08 +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 | 64c677be9e | Renamed config macro to match convention. | 2012-09-12 03:17:50 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | e15e92b583 | Fixed function grouping. | 2012-09-11 23:56:44 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 0e2b12be43 | Corrected comment. | 2012-09-11 23:53:10 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 023b816bcc | Disallowed hiding of fullscreen windows. | 2012-09-11 23:51:45 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | d214bfdfde | Made defaults test window hidden. | 2012-09-11 22:23:35 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | dcc3d67158 | Merge branch 'showwindow' | 2012-09-11 20:03:55 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 7be55239e7 | Disabled native API by default. | 2012-09-11 20:02:13 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 0272ce2e98 | Merge branch 'master' into EGL Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c | 2012-09-09 19:52:33 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 7493bbe0c8 | Removed X11 prefix from EGL and GLX files. | 2012-09-09 19:33:40 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 74488bec67 | Further isolated X11-specific parts of EGL code. | 2012-09-09 19:21:14 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 0ca1e67d7a | Moved X11-specific defines to X11 header. | 2012-09-09 19:03:17 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | dd69985649 | Fixed API error tags. | 2012-09-09 19:01:48 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | feef05f839 | Removed superfluous inclusion. | 2012-09-09 14:22:14 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 50d68c83bb | Fixed TinyCThread declaring timespec on OS X. | 2012-09-09 13:56:57 +02:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 2b946289d8 | Added direct dependency on librt for threads test on X11. | 2012-09-09 01:31:23 +02:00 |  |