Merge branch 'utf8' into multi-monitor

Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Camilla Berglund
2012-02-04 20:12:28 +01:00
45 changed files with 2299 additions and 489 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ int main(void)
GLFWvidmode dtmode, modes[400];
int modecount, i;
if (!glfwInit())
if (!glfwInit(NULL))
{
fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError()));
exit(EXIT_FAILURE);