Camilla Berglund cbcab56a25 Merge branch 'master' into EGL ...

Conflicts:
	include/GL/glfw3.h
	src/opengl.c
	src/win32_opengl.c
	src/window.c
	src/x11_fullscreen.c
	src/x11_glx_opengl.c
	src/x11_platform.h
	src/x11_window.c
	tests/glfwinfo.c

2012-09-06 21:05:03 +02:00

..

clipboard.c

Simplified clipboard API.

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

CMakeLists.txt

Merge branch 'master' into EGL

2012-09-06 21:05:03 +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

Moved glext.h inclusion back.

2012-07-21 23:51:08 +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 EGL

2012-09-06 21:05:03 +02:00

config.h.in

Add EGL related configurations

2012-07-17 22:25:47 +03:00

fullscreen.c

Merge branch 'master' of github.com:elmindreda/glfw

2012-08-26 15:39:10 +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

Comment fixes.

2012-08-26 21:29:26 +02:00

input.c

Removed calling of callbacks from setters.

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

internal.h

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

joystick.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

opengl.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +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

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

Included malloc.h from files using malloc on Win32.

2012-08-14 13:52:48 +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_native.c

Added explicit access to native handles.

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

win32_opengl.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

win32_platform.h

Shortened PC boolean name.

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

win32_time.c

Shortened PC boolean name.

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

win32_window.c

API tag and error message cleanup.

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

window.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

x11_clipboard.c

API tag and error message cleanup.

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

x11_egl_opengl.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

x11_egl_platform.h

Added support for EGL_KHR_create_context.

2012-07-22 01:33:42 +02:00

x11_fullscreen.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

x11_gamma.c

API tag and error message cleanup.

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

x11_glx_opengl.c

Merge branch 'master' into EGL

2012-09-06 21:05:03 +02:00

x11_glx_platform.h

Moved glext.h inclusion back.

2012-07-21 23:51:08 +02:00

x11_init.c

API tag and error message cleanup.

2012-08-28 15:03:57 +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_native.c

Added explicit access to native handles.

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

x11_platform.h

Merge branch 'master' into EGL

2012-09-06 21:05:03 +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 EGL

2012-09-06 21:05:03 +02:00