Merge branch 'master' into multi-monitor

Conflicts:
	tests/modes.c
This commit is contained in:
Camilla Berglund
2012-08-14 14:02:37 +02:00
53 changed files with 517 additions and 842 deletions
+1
View File
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <limits.h>
#include <malloc.h>
//========================================================================