| 
							
							
								 Camilla Berglund | d976a7a86d | Added Win32 library binaries. | 2012-03-22 14:27:19 +01:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 58f78d4d15 | Updated .gitignore. | 2012-02-04 17:20:05 +01:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 2935652f48 | Merge remote-tracking branch 'tikhomirov/osx_joystick' Conflicts:
	.gitignore
	src/cocoa_init.m | 2012-01-29 15:05:58 +01:00 |  | 
			
				
					| 
							
							
								 Camilla Berglund | 2b106336ae | Updated .gitignore. | 2012-01-10 21:39:16 +01:00 |  | 
			
				
					| 
							
							
								 Sergey Tikhomirov | 901a743d97 | Added OS X specific stuff into .gitignore | 2011-09-17 10:41:08 +03:00 |  | 
			
				
					| 
							
							
								 Olivier Delannoy | 70647eaad5 | Added ignore rules for git, the heightmap examples from GLFW 2.7 and fixed a built issue on X11 introduced by using glxext.h | 2010-09-24 21:47:25 +01:00 |  |