Commit Graph

22 Commits

Author SHA1 Message Date
Matthew Henry
2d1a98136e Added support for CGL context access in glfw3native.h
This allows access to the underlying context on OSX without dropping
into ObjC as CGL is an entirely C-based API
2014-01-12 12:16:36 +10:00
Camilla Berglund
89627e4cd0 Cleaned up particles example. 2014-01-11 21:29:58 +01:00
Camilla Berglund
a8ff81fd8a Updated .gitignore. 2013-10-09 19:46:44 +02:00
Camilla Berglund
5ae2e376a2 Added missing file to .gitignore. 2013-06-17 17:36:52 +02:00
Camilla Berglund
2bb0be38ce Corrected sonames in .gitignore file. 2013-05-22 23:04:43 +02:00
Camilla Berglund
2b0b031ed7 Updated gitignore file. 2013-05-20 12:46:42 +02:00
Camilla Berglund
9a5feaad05 Dropped fsfocus test. 2013-05-20 12:45:41 +02:00
Camilla Berglund
367c591f7d Updated .gitignore. 2013-03-06 23:30:42 +01:00
Ed Ropple
8491a9fae1 Added VS 2012-specific entries to .gitignore. 2013-02-15 22:16:49 -05: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
755c2a364b Updated .gitignore. 2012-09-06 23:57:36 +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
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
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