Camilla Berglund 1fd9428287 Merge branch 'master' into joystickname ...

Conflicts:
	src/x11_joystick.c

2012-11-08 15:55:25 +01:00

..

accuracy.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

clipboard.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

CMakeLists.txt

Added direct dependency on librt for threads test on X11.

2012-09-09 01:31:23 +02:00

defaults.c

Made defaults test window hidden.

2012-09-11 22:23:35 +02:00

events.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

fsaa.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

fsfocus.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

gamma.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

glfwinfo.c

Removed registering glfwTerminate with atexit.

2012-10-22 03:20:16 +02:00

iconify.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

joysticks.c

Merge branch 'master' into joystickname

2012-11-08 15:55:25 +01:00

modes.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

peter.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

reopen.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

sharing.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

tearing.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

threads.c

Fixed warnings on VC++.

2012-09-27 02:49:20 +02:00

title.c

Made window-related callbacks per-window.

2012-10-29 13:36:01 +01:00

windows.c

Removed registering glfwTerminate with atexit.

2012-10-22 03:20:16 +02:00