Camilla Berglund 0272ce2e98 Merge branch 'master' into EGL ...

Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c

2012-09-09 19:52:33 +02:00

..

clipboard.c

Simplified clipboard API.

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

CMakeLists.txt

Removed X11 prefix from EGL and GLX files.

2012-09-09 19:33:40 +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

Implemented TLS for all platforms.

2012-08-13 16:03:44 +02:00

cocoa_input.m

API tag and error message cleanup.

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

cocoa_joystick.m

Fixed bad editing in Cocoa joystick code.

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

cocoa_native.m

Fixed copypaste errors.

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

cocoa_opengl.m

Implemented TLS for all platforms.

2012-08-13 16:03:44 +02:00

cocoa_platform.h

Merge branch 'master' into EGL

2012-09-09 19:52:33 +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-09 19:52:33 +02:00

config.h.in

Add EGL related configurations

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

egl_opengl.c

Merge branch 'master' into EGL

2012-09-09 19:52:33 +02:00

egl_platform.h

Removed X11 prefix from EGL and GLX files.

2012-09-09 19:33:40 +02:00

fullscreen.c

Removed superfluous inclusion.

2012-09-09 14:22:14 +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

glx_opengl.c

Merge branch 'master' into EGL

2012-09-09 19:52:33 +02:00

glx_platform.h

Removed X11 prefix from EGL and GLX files.

2012-09-09 19:33:40 +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-09 19:52:33 +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-09 19:52:33 +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-09 19:52:33 +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-09 19:52:33 +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 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_init.c

Merge branch 'master' into EGL

2012-09-09 19:52:33 +02:00

x11_input.c

API tag and error message cleanup.

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

x11_joystick.c

Formatting.

2012-09-07 15:48:03 +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-09 19:52:33 +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-09 19:52:33 +02:00