Camilla Berglund 39c171a61d Merge branch 'master' into multi-monitor ... Conflicts: tests/modes.c		2012-08-14 14:02:37 +02:00
..
GL	Merge branch 'master' into multi-monitor	2012-08-14 14:02:37 +02:00