Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor

This commit is contained in:
Camilla Berglund
2012-02-05 02:50:22 +01:00
9 changed files with 150 additions and 153 deletions
+1 -1
View File
@@ -339,7 +339,7 @@ static void char_callback(GLFWwindow window, int character)
void monitor_callback(GLFWmonitor monitor, int event)
{
printf("%08x at %0.3f: Monitor %s %s",
printf("%08x at %0.3f: Monitor %s %s\n",
counter++,
glfwGetTime(),
glfwGetMonitorString(monitor, GLFW_MONITOR_NAME),