Merge branch 'master' into tls

This commit is contained in:
Camilla Berglund 2012-08-12 16:47:40 +02:00
commit c9896a2f75
2 changed files with 4 additions and 2 deletions

View File

@ -30,6 +30,8 @@
#include "internal.h"
#include <stdlib.h>
//========================================================================
// The per-thread current context/window pointer

View File

@ -67,8 +67,8 @@ int main(void)
glfwMakeContextCurrent(windows[i]);
glClearColor((GLclampf) (i & 1),
(GLclampf) (i >> 1),
i ? 0.0 : 1.0,
0.0);
i ? 0.f : 1.f,
0.f);
glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300);
}