| commit | 508c7fe0e69312e784d5e4ec00e54519e56fc8ce | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 27 23:32:26 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 27 23:32:26 2012 +0200 |
| tree | 1c078e67d8ae8ba0b937bb5d87791c99243bb778 | |
| parent | 1be1636326e485fd39e507e862159e74e2d2bc02 [diff] | |
| parent | 410a4e29e133fe911c817fb1061df16420c4365a [diff] |
Merge branch 'master' into multi-monitor Conflicts: src/window.c