| commit | 9a183090e0e64f9170dd8683d4903fca6d9985e7 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 06 15:11:50 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Thu Sep 06 15:11:50 2012 +0200 |
| tree | c41eafaec9b01e800dcefd52a1745ae7ae1d670f | |
| parent | d0ad28f174a1d8f1248c86f5dc456d91f546e5c0 [diff] | |
| parent | a339098bc01b246d67ad165bcd2380ce51d666db [diff] |
Merge branch 'master' into showwindow Conflicts: src/window.c