Camilla Berglund 279c32e3f9 Merge branch 'master' of github.com:elmindreda/glfw ...

Conflicts:
	CMakeLists.txt
	src/egl_context.c

2013-01-05 18:37:12 +01:00

..

clipboard.c

Renamed _glfwInputError and moved to event API.

2012-12-31 21:05:28 +01:00

CMakeLists.txt

Merge branch 'master' into multi-monitor

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

cocoa_clipboard.m

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

cocoa_gamma.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

cocoa_init.m

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

cocoa_joystick.m

Renamed struct member to match other platforms.

2012-12-02 16:52:40 +01:00

cocoa_monitor.m

Connected monitor API with Cocoa mode setting.

2013-01-03 20:11:41 +01:00

cocoa_native.m

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

cocoa_platform.h

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

cocoa_time.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

cocoa_window.m

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

config.h.in

Removed EGL dlopen.

2013-01-04 06:59:07 +01:00

context.c

Renamed _glfwInputError and moved to event API.

2012-12-31 21:05:28 +01:00

egl_context.c

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

2013-01-05 18:37:12 +01:00

egl_platform.h

Removed EGL dlopen.

2013-01-04 06:59:07 +01:00

gamma.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

glfw3.pc.in

Renamed libglfw3.pc to glfw3.pc.

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

glx_context.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

glx_platform.h

Formatting.

2013-01-02 17:07:04 +01:00

init.c

Started adding documentation for internal APIs.

2013-01-02 03:42:20 +01:00

input.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

internal.h

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

joystick.c

Renamed _glfwInputError and moved to event API.

2012-12-31 21:05:28 +01:00

monitor.c

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

nsgl_context.m

Removed use of removed token.

2013-01-03 20:01:56 +01:00

nsgl_platform.h

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

time.c

Renamed _glfwInputError and moved to event API.

2012-12-31 21:05:28 +01:00

wgl_context.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

wgl_platform.h

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

win32_clipboard.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

win32_gamma.c

API tag and error message cleanup.

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

win32_init.c

Fixed Win32 joystick name memory leak.

2013-01-02 01:52:28 +01:00

win32_joystick.c

Fixed Win32 joystick name memory leak.

2013-01-02 01:52:28 +01:00

win32_monitor.c

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

win32_native.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

win32_platform.h

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

win32_time.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

win32_window.c

Removed unused code and duplicate variables.

2013-01-04 06:42:37 +01:00

window.c

Cleanup.

2013-01-04 07:46:44 +01:00

x11_clipboard.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

x11_gamma.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

x11_init.c

Cleanup.

2013-01-04 07:11:30 +01:00

x11_joystick.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

x11_keysym2unicode.c

API tag and error message cleanup.

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

x11_monitor.c

Begun integrating mode setting and monitor API.

2013-01-03 17:56:59 +01:00

x11_native.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

x11_platform.h

Cleanup.

2013-01-04 07:46:44 +01:00

x11_time.c

Renamed global struct and substructs.

2013-01-02 01:44:57 +01:00

x11_window.c

Removed panning hack only needed by Xxf86vm.

2013-01-04 07:12:15 +01:00