Camilla Berglund 6b98a04d17 Merge branch 'utf8' into multi-monitor ...

Conflicts:
	src/CMakeLists.txt

2012-02-04 20:12:28 +01:00

..

CMakeLists.txt

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

cocoa_fullscreen.m

Flattened source tree.

2011-07-26 16:50:12 +02:00

cocoa_gamma.m

Removed speculation.

2012-01-18 21:13:06 +01:00

cocoa_init.m

Merge remote-tracking branch 'tikhomirov/osx_joystick'

2012-01-29 15:05:58 +01:00

cocoa_input.m

Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.

2012-02-04 00:51:35 +01:00

cocoa_joystick.m

Compatibility fixes.

2012-01-30 00:02:54 +01:00

cocoa_opengl.m

Renamed context-related functions to more closely match underlying APIs.

2011-07-27 16:01:27 +02:00

cocoa_platform.h

Added initial joystick support on OS X

2011-09-18 22:05:00 +03:00

cocoa_time.m

Flattened source tree.

2011-07-26 16:50:12 +02:00

cocoa_window.m

Added UTF-8 window title support for Cocooa.

2012-02-04 02:15:17 +01:00

config.h.in

Purged references to GLFW as a framework.

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

error.c

Added glfwInit exception comment.

2012-01-10 21:35:13 +01:00

fullscreen.c

Merge branch 'master' into multi-display-support

2011-10-07 00:35:37 -04:00

gamma.c

Brought back non-relative gamma ramp generation.

2011-09-20 15:44:54 +02:00

init.c

Removed GLFWthreadmodel and glfwInitWithModels.

2012-02-04 01:38:00 +01:00

input.c

Moved input mode functions to top.

2012-02-04 01:34:12 +01:00

internal.h

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

joystick.c

Purged references to GLFW as a framework.

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

libglfw.pc.cmake

Pkg-config file generation work.

2011-09-19 18:46:20 +02:00

monitor.c

Stub implementation of monitor callback.

2011-10-09 00:20:34 -04:00

opengl.c

Formatting.

2011-10-08 23:57:03 +02:00

time.c

Purged references to GLFW as a framework.

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

win32_dllmain.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

win32_fullscreen.c

Reshuffling, formatting and shortening.

2011-10-06 23:28:56 +02:00

win32_gamma.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

win32_init.c

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

win32_input.c

Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.

2012-02-04 00:51:35 +01:00

win32_joystick.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

win32_monitor.c

Implemented monitor (dis)connect callback for win32.

2011-10-14 14:32:06 -04:00

win32_opengl.c

Shortened native extension boolean names.

2011-09-06 14:51:03 +02:00

win32_platform.h

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

win32_time.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

win32_window.c

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

window.c

Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.

2012-02-04 00:51:35 +01:00

x11_fullscreen.c

Merge branch 'master' into multi-display-support

2011-10-07 00:35:37 -04:00

x11_gamma.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

x11_init.c

Merged with master.

2012-01-24 18:00:51 +01:00

x11_input.c

Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode.

2012-02-04 00:51:35 +01:00

x11_joystick.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

x11_keysym2unicode.c

Flattened source tree.

2011-07-26 16:50:12 +02:00

x11_monitor.c

Restored dropped guards for RandR-specific function.

2011-10-06 23:53:11 +02:00

x11_opengl.c

Removed declarations made superfluous by our glxext.h header.

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

x11_platform.h

Merge branch 'utf8' into multi-monitor

2012-02-04 20:12:28 +01:00

x11_time.c

Formatting.

2011-09-20 18:52:00 +02:00

x11_window.c

Added support for _NET_WM_ICON_NAME.

2012-02-02 17:20:14 +01:00