| commit | 7aaeb6955bebc5cd601f6fc162225c57be2f03a8 | [log] [tgz] |
|---|---|---|
| author | Camilla Berglund <elmindreda@elmindreda.org> | Sun Sep 23 15:26:53 2012 +0200 |
| committer | Camilla Berglund <elmindreda@elmindreda.org> | Sun Sep 23 15:26:53 2012 +0200 |
| tree | 1e708bff35c1ccb0a992054ffb2c9e200334294b | |
| parent | 6a5ebbc8709365a17ef440e0cf3f51bf68e92d4c [diff] | |
| parent | c0dcb5a056eb0433cc6dc4a9d22c0d00eb4b1bd0 [diff] |
Merge branch 'master' into multi-monitor Conflicts: src/x11_window.c