diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-03-03 17:10:53 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-03-03 17:10:53 +0100 |
| commit | d78ae0546dae17eda6084a1bd33e63637ba802e5 (patch) | |
| tree | 178e0210cf804c7ea9ed3690bae8b7d81b9fe0bf /openbox/openbox.c | |
| parent | 4b5373f609e6462995a38cc4f0f50b17cbc8f835 (diff) | |
| parent | 40996c42b3b3dae96338abac1a250a905d0fd8d9 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/session.c
Diffstat (limited to 'openbox/openbox.c')
0 files changed, 0 insertions, 0 deletions