| commit | 22a88cfe99d897dc7d3be7b53b954f6cdfa250c6 | |
| author | Mikael Magnusson <mikachu@comhem.se> | |
| Wed, 27 Feb 2008 03:50:41 +0000 (27 04:50 +0100) | ||
| committer | Dana Jansens <danakj@orodu.net> | |
| Wed, 27 Feb 2008 07:34:08 +0000 (27 02:34 -0500) | ||
| tree | 1ef48238ea15993d800874bb99444c7de0364411 | treesnapshot (tar.gz zip) |
| parent | 7e47a57027e043d4fe908d5f0acb7882d4f9330f | commitdiff |
| parent | 490ef3213a09ec2b202e9b511a92ce89f811af66 | commitdiff |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/event.h
Conflicts:
openbox/client.c
openbox/event.c
openbox/event.h
| openbox/client.c | diff1 | diff2 | blobhistory |
| openbox/event.c | diff1 | diff2 | blobhistory |
| openbox/event.h | diff1 | diff2 | blobhistory |
| openbox/focus.c | diff1 | diff2 | blobhistory |