Camilla Berglund 508c7fe0e6 Merge branch 'master' into multi-monitor ... Conflicts: src/window.c		2012-09-27 23:32:26 +02:00
..
GL	Merge branch 'master' into multi-monitor	2012-09-27 23:32:26 +02:00