Camilla Berglund 73cdc34df7 Merge branch 'master' into multi-monitor ...

Conflicts:
	CMakeLists.txt
	readme.html
	src/CMakeLists.txt
	src/cocoa_platform.h
	src/win32_platform.h
	src/x11_platform.h
	tests/events.c

2012-12-02 20:52:03 +01:00

..

clipboard.c

Simplified clipboard API.

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

CMakeLists.txt

Merge branch 'master' into multi-monitor

2012-12-02 20:52:03 +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

Renamed struct member to match other platforms.

2012-12-02 16:52:40 +01: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_platform.h

Merge branch 'master' into multi-monitor

2012-12-02 20:52:03 +01: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-12-02 20:52:03 +01:00

config.h.in

Finished initial window/context backend split.

2012-11-27 15:02:26 +01:00

context.c

Merge branch 'master' into EGL

2012-12-02 16:17:59 +01:00

egl_context.c

Added explicit non-support for sRGB on EGL.

2012-12-02 16:29:56 +01:00

egl_platform.h

Finished initial window/context backend split.

2012-11-27 15:02:26 +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

glx_context.c

Merge branch 'master' into EGL

2012-12-02 16:17:59 +01:00

glx_platform.h

Merge branch 'master' into EGL

2012-12-02 16:17:59 +01: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-12-02 20:52:03 +01:00

joystick.c

Formatting.

2012-12-02 16:53:28 +01:00

monitor.c

Removed 'screen' from monitor nomenclature.

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

nsgl_context.m

Renamed context module files.

2012-11-27 15:21:49 +01:00

nsgl_platform.h

Finished initial window/context backend split.

2012-11-27 15:02:26 +01:00

time.c

Purged references to GLFW as a framework.

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

wgl_context.c

Merge branch 'master' into EGL

2012-12-02 16:17:59 +01:00

wgl_platform.h

Merge branch 'master' into EGL

2012-12-02 16:17:59 +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

Finished initial window/context backend split.

2012-11-27 15:02:26 +01:00

win32_joystick.c

Initial implementation of joystick name retrieval on Win32.

2012-11-08 16:26:15 +01: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_platform.h

Merge branch 'master' into multi-monitor

2012-12-02 20:52:03 +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-12-02 20:52:03 +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

Finished initial window/context backend split.

2012-11-27 15:02:26 +01:00

x11_joystick.c

Added missing test for joystick presence.

2012-11-08 16:26:43 +01:00

x11_keysym2unicode.c

API tag and error message cleanup.

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

x11_monitor.c

Merge branch 'master' into multi-monitor

2012-12-02 20:52:03 +01:00

x11_native.c

Added explicit access to native handles.

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

x11_platform.h

Merge branch 'master' into multi-monitor

2012-12-02 20:52:03 +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-12-02 20:52:03 +01:00