diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2008-10-27 00:58:56 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2008-10-27 00:58:56 +0100 |
| commit | e6fea245756b59f83dc0f51d13feee9cf093a1a1 (patch) | |
| tree | cefbc79a17772ac53d3df991d4c6a1c6a6319aaf /obt/parse.h | |
| parent | 7b57ef12963a298c731d0ef4a67de9c985ac9ba4 (diff) | |
| parent | c564b6245fcfaf0efd523cfa17bc1a73fe640d68 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/prop.c
openbox/prop.h
Diffstat (limited to 'obt/parse.h')
0 files changed, 0 insertions, 0 deletions