Commit Graph

8 Commits

Author SHA1 Message Date
Camilla Berglund
26c95559d2 Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor
Conflicts:
	.gitignore
2012-01-29 19:09:20 +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
Marcel Metz
c7a5474bfc Merged with master. 2012-01-24 18:00:51 +01:00
Marcel Metz
7fbb707ac3 Added tests to gitignore. 2012-01-11 09:11:34 +01:00
Camilla Berglund
2b106336ae Updated .gitignore. 2012-01-10 21:39:16 +01:00
Marcel Metz
021ce1f7f4 Added windows build intermediate files to .gitignore. 2011-10-01 01:49:35 -04: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