diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-04-23 16:41:35 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-04-23 17:07:10 +0200 |
| commit | 6799c67c07e99c440f549802f60d9f16995ab711 (patch) | |
| tree | 096d1066947d6e8bc1278166b94b2de8b6cd684f /data/rc.xml | |
| parent | 661a53cb6843d02f3373feab91052c47397bb6ed (diff) | |
| parent | a7bbdf7d6199d1289f5ecc1b4e25632d88d75387 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/keyboard.c
openbox/moveresize.c
Diffstat (limited to 'data/rc.xml')
0 files changed, 0 insertions, 0 deletions