Camilla Berglund 41bc0d18f4 Merge branch 'master' into multi-monitor ...

Conflicts:
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/win32_window.c
	src/window.c
	src/x11_window.c
	tests/clipboard.c
	tests/defaults.c
	tests/events.c
	tests/fsfocus.c
	tests/glfwinfo.c
	tests/joysticks.c
	tests/peter.c
	tests/sharing.c
	tests/tearing.c
	tests/title.c
	tests/windows.c

2012-11-27 16:55:04 +01:00

..

clipboard.c

Simplified clipboard API.

2012-04-12 00:51:58 +02:00

CMakeLists.txt

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

cocoa_clipboard.m

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

cocoa_gamma.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

cocoa_init.m

Merge branch 'master' into multi-monitor

2012-09-12 06:04:17 +02:00

cocoa_joystick.m

Fixed bad editing in Cocoa joystick code.

2012-09-07 02:15:54 +02:00

cocoa_monitor.m

Improved handling of primary monitor.

2012-09-13 17:46:40 +02:00

cocoa_native.m

Fixed copypaste errors.

2012-07-23 00:48:30 +02:00

cocoa_opengl.m

Removed glfwCopyContext to map better against EGL.

2012-11-22 20:16:48 +01:00

cocoa_platform.h

Began implementing multi-monitor on Cocoa.

2012-09-13 16:37:06 +02:00

cocoa_time.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

cocoa_window.m

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

config.h.in

Replaced ad-hoc Linux detection with __linux__.

2012-11-05 16:19:11 +01:00

gamma.c

Fixed use of functions missing on VC++.

2012-09-27 02:35:19 +02:00

glfw3.pc.in

Renamed libglfw3.pc to glfw3.pc.

2012-08-12 22:31:47 +02:00

init.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

input.c

Made glfwSetCursorPos fail silently if lacking focus.

2012-11-22 17:20:16 +01:00

internal.h

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

2012-08-29 18:58:16 +02:00

monitor.c

Removed 'screen' from monitor nomenclature.

2012-10-22 02:39:22 +02:00

opengl.c

Removed glfwCopyContext to map better against EGL.

2012-11-22 20:16:48 +01:00

time.c

Purged references to GLFW as a framework.

2011-03-06 01:46:39 +01:00

win32_clipboard.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

win32_gamma.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

win32_init.c

Moved DllMain into Win32 init module.

2012-09-12 21:23:04 +02:00

win32_joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

2012-08-29 18:58:16 +02:00

win32_monitor.c

Merge branch 'master' into multi-monitor

2012-11-08 16:29:56 +01:00

win32_native.c

Added explicit access to native handles.

2012-07-22 15:26:15 +02:00

win32_opengl.c

Updated error codes to better reflect multi-API support.

2012-11-23 12:00:49 +01:00

win32_platform.h

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

win32_time.c

Shortened PC boolean name.

2012-09-02 15:21:40 +02:00

win32_window.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

window.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

x11_clipboard.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

x11_gamma.c

Formatting.

2012-10-18 17:54:55 +02:00

x11_init.c

Updated error codes to better reflect multi-API support.

2012-11-23 12:00:49 +01:00

x11_joystick.c

Replaced ad-hoc Linux detection with __linux__.

2012-11-05 16:19:11 +01:00

x11_keysym2unicode.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

x11_monitor.c

Added missing X extension test.

2012-10-22 00:55:36 +02:00

x11_native.c

Added explicit access to native handles.

2012-07-22 15:26:15 +02:00

x11_opengl.c

Tagged comment.

2012-11-23 12:02:09 +01:00

x11_platform.h

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00

x11_time.c

API tag and error message cleanup.

2012-08-28 15:03:57 +02:00

x11_window.c

Merge branch 'master' into multi-monitor

2012-11-27 16:55:04 +01:00