Camilla Berglund 560b6b5a11 Merge branch 'master' into multi-monitor ...

Conflicts:
	src/CMakeLists.txt
	src/internal.h
	src/x11_platform.h

2012-08-29 20:36:07 +02:00

..

accuracy.c

Formatting.

2012-08-12 15:32:06 +02:00

clipboard.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

CMakeLists.txt

Moved Free Getopt files to support directory.

2012-08-12 12:44:23 +02:00

defaults.c

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

2012-08-12 15:31:34 +02:00

events.c

Merge branch 'master' into multi-monitor

2012-08-29 20:36:07 +02:00

fsaa.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

fsfocus.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

gamma.c

Fix various warnings reported by gcc

2012-08-12 14:02:38 +02:00

glfwinfo.c

Moved glfwinfo version check to before glfwInit.

2012-08-28 22:56:35 +02:00

iconify.c

Fix various warnings reported by gcc

2012-08-12 14:02:38 +02:00

joysticks.c

Renamed glfwGetJoystickPos to glfwGetJoystickAxes.

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

modes.c

Merge branch 'master' into multi-monitor

2012-08-14 14:02:37 +02:00

peter.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

reopen.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

sharing.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

tearing.c

Formatting.

2012-08-12 15:32:06 +02:00

title.c

Removed implicit glfwMakeCurrentContext.

2012-08-10 15:29:45 +02:00

windows.c

Fixed float constant type mismatches.

2012-08-12 13:37:12 +02:00