| commit | 11e2828bdcf3ec4d59482a35fb510c51cc26acf6 | [log] [tgz] |
|---|---|---|
| author | Kristian Høgsberg <krh@bitplanet.net> | Mon Apr 11 16:47:50 2011 -0400 |
| committer | Kristian Høgsberg <krh@bitplanet.net> | Mon Apr 11 16:47:50 2011 -0400 |
| tree | c5dfb56f016b350f0a3e757701563c71240fc7de | |
| parent | 3555d09813cfe97ad2170bbb58655f7bb2aae7b0 [diff] | |
| parent | ec4d342aa9b536c71bcf0d75249549860941793b [diff] |
Merge remote-tracking branch 'bnf/surface-frame-event' Conflicts: compositor/compositor.c