| commit | 308478e4a5f4dc76d69395dda8a9bc42cb69eec4 | |
| author | Mikael Magnusson <mikachu@gmail.com> | |
| Sun, 5 Jul 2009 20:27:25 +0000 (5 22:27 +0200) | ||
| committer | Mikael Magnusson <mikachu@gmail.com> | |
| Sat, 19 Sep 2009 13:03:12 +0000 (19 15:03 +0200) | ||
| tree | 54ec31d91428b2a7d3e4c7bdf902fe182abfc25d | treesnapshot (tar.gz zip) |
| parent | 3f72b9d67f21781e513a9c058e8624b8b86b92ea | commitdiff |
| parent | ba1ac214dfdbc0539c922e84c2318c1bf2566c0c | commitdiff |
Merge branch 'backport' into work
Conflicts:
openbox/actions/desktop.c
openbox/client.c
openbox/event.c
openbox/extensions.c
openbox/popup.c
openbox/screen.c
parser/parse.c
Conflicts:
openbox/actions/desktop.c
openbox/client.c
openbox/event.c
openbox/extensions.c
openbox/popup.c
openbox/screen.c
parser/parse.c
12 files changed: