Camilla Berglund 560b6b5a11 Merge branch 'master' into multi-monitor ...

Conflicts:
	src/CMakeLists.txt
	src/internal.h
	src/x11_platform.h

2012-08-29 20:36:07 +02:00

..

clipboard.c

Simplified clipboard API.

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

CMakeLists.txt

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

cocoa_clipboard.m

API tag and error message cleanup.

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

cocoa_fullscreen.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

Only restore gamma ramp if it has been changed.

2012-05-24 11:46:51 +02:00

cocoa_input.m

API tag and error message cleanup.

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

cocoa_joystick.m

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

cocoa_native.m

Fixed copypaste errors.

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

cocoa_opengl.m

Added window parameter to glfwSwapBuffers.

2012-08-06 18:13:37 +02:00

cocoa_platform.h

Split platform-specific global data.

2012-04-22 15:53:02 +02:00

cocoa_time.c

API tag and error message cleanup.

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

cocoa_window.m

API tag and error message cleanup.

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

config.h.in

Removed config macro values.

2012-06-12 03:00:16 +02:00

fullscreen.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

gamma.c

Only restore gamma ramp if it has been changed.

2012-05-24 11:46:51 +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-08-29 20:36:07 +02:00

input.c

Removed calling of callbacks from setters.

2012-08-07 12:45:55 +02:00

internal.h

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

monitor.c

Moved internal API code to proper location.

2012-08-14 21:47:09 +02:00

opengl.c

Fixed return value of glfwGetCurrentContext.

2012-08-27 13:52:10 +02: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_dllmain.c

API tag and error message cleanup.

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

win32_fullscreen.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

win32_gamma.c

API tag and error message cleanup.

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

win32_init.c

Merge branch 'master' into multi-monitor

2012-08-14 14:02:37 +02:00

win32_input.c

API tag and error message cleanup.

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

win32_joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

win32_monitor.c

Formatting.

2012-07-06 14:36:29 +02:00

win32_native.c

Added explicit access to native handles.

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

win32_opengl.c

API tag and error message cleanup.

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

win32_platform.h

Merge branch 'master' into multi-monitor

2012-08-03 02:57:33 +02:00

win32_time.c

API tag and error message cleanup.

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

win32_window.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

window.c

Added channel bit depth hint defaults.

2012-08-29 16:00:54 +02:00

x11_clipboard.c

API tag and error message cleanup.

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

x11_fullscreen.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

x11_gamma.c

API tag and error message cleanup.

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

x11_init.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

x11_input.c

API tag and error message cleanup.

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

x11_joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

x11_keysym2unicode.c

API tag and error message cleanup.

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

x11_monitor.c

Formatting.

2012-08-16 19:11:31 +02:00

x11_native.c

Added explicit access to native handles.

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

x11_opengl.c

API tag and error message cleanup.

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

x11_platform.h

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02: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-08-29 20:36:07 +02:00