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

..

accuracy.c

Unified nomenclature for cursor positions.

2012-06-22 13:57:25 +02:00

clipboard.c

Fixed test description.

2012-04-12 18:42:56 +02:00

CMakeLists.txt

Removed listmodes test.

2012-05-07 00:34:40 +02:00

defaults.c

Removed allocator.

2012-02-07 14:58:58 +01:00

events.c

Merge branch 'master' into multi-monitor

2012-07-05 16:15:01 +02:00

fsaa.c

Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU.

2012-06-05 23:55:10 +02:00

fsfocus.c

Removed allocator.

2012-02-07 14:58:58 +01:00

gamma.c

Removed allocator.

2012-02-07 14:58:58 +01:00

getopt.c

Various Windows and VC++ 2010 fixes.

2011-07-27 17:09:17 +02:00

getopt.h

Initial import of 2.7 Lite.

2010-09-07 17:34:51 +02:00

glfwinfo.c

Output fix.

2012-03-05 20:22:23 +01:00

iconify.c

Added logging of window size.

2012-02-09 02:07:43 +01:00

joysticks.c

Rewrote joystick test.

2012-06-06 02:04:15 +02:00

modes.c

Merge branch 'master' into multi-monitor

2012-07-05 16:15:01 +02:00

peter.c

Unified nomenclature for cursor positions.

2012-06-22 13:57:25 +02:00

reopen.c

Removed allocator.

2012-02-07 14:58:58 +01:00

sharing.c

Renamed GLFW_NO_GLU to GLFW_INCLUDE_GLU.

2012-06-05 23:55:10 +02:00

tearing.c

Tearing test cleanup.

2012-02-09 02:25:25 +01:00

title.c

Removed allocator.

2012-02-07 14:58:58 +01:00

windows.c

Removed allocator.

2012-02-07 14:58:58 +01:00