diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-03-02 19:41:32 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-03-02 19:41:32 +0100 |
| commit | 9676757a08b3e2e508c47f7795326bda8e54dc53 (patch) | |
| tree | fe390424216d8d3db2f95d50b61adc44262f0658 /obt | |
| parent | feec8f663f0a11546c2da87575fecc8a88d97ca1 (diff) | |
| parent | e4691468cd291a6bd2b489e90eca2be78b8d0c51 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/desktop.c
openbox/actions/if.c
Diffstat (limited to 'obt')
0 files changed, 0 insertions, 0 deletions