| commit | 39c171a61daff1f14da65635126cd610ffb4e562 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Tue Aug 14 14:02:37 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Tue Aug 14 14:02:37 2012 +0200 |
| tree | 2202a80d63f7396dccf7957b61910ecc01e11dc0 | |
| parent | 854e634fec4475ac3aaf0ec7408d601a0e4eeb5d [diff] | |
| parent | 6399fb19fd91b809217a5602083e858479b1067a [diff] |
Merge branch 'master' into multi-monitor Conflicts: tests/modes.c