diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2009-01-29 22:45:47 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2009-01-29 22:45:47 +0100 |
| commit | 4145468a1984e1055a947ad957075ae51f70ca9c (patch) | |
| tree | 923b1d6ae11d4ba0c471779229d2f76642bf4774 /data/rc.xml | |
| parent | 90cecafa3de2f118e550622932d1d30266c71226 (diff) | |
| parent | d0829d4416d83fda4aa4ec8d5f0a7003b0a7f148 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/event.c
openbox/frame.c
Diffstat (limited to 'data/rc.xml')
0 files changed, 0 insertions, 0 deletions