tree 2202a80d63f7396dccf7957b61910ecc01e11dc0
parent 854e634fec4475ac3aaf0ec7408d601a0e4eeb5d
parent 6399fb19fd91b809217a5602083e858479b1067a
author Camilla Berglund <elmindreda@elmindreda.org> 1344945757 +0200
committer Camilla Berglund <elmindreda@elmindreda.org> 1344945757 +0200

Merge branch 'master' into multi-monitor

Conflicts:
	tests/modes.c