merge r6996-7017 from trunk
authorDana Jansens <danakj@orodu.net>
Mon, 28 May 2007 20:11:21 +0000 (20:11 +0000)
committerDana Jansens <danakj@orodu.net>
Mon, 28 May 2007 20:11:21 +0000 (20:11 +0000)
commit00c1db63632c6d8f60aeff17c4a470b7c097a583
tree4655f302065cd6abebedc1c0d03917e70718c1ab
parenta6b9adba1a6c0ff198a6cbc508f97349749ca0e3
merge r6996-7017 from trunk
17 files changed:
.svnignore [new file with mode: 0644]
configure.ac
data/xsession/.svnignore [new file with mode: 0644]
debian/.svnignore [new file with mode: 0644]
doc/.svnignore [new file with mode: 0644]
m4/.svnignore [new file with mode: 0644]
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
po/.svnignore [new file with mode: 0644]
po/ca.po
render/theme.c
render/theme.h
tests/.svnignore [new file with mode: 0644]
tests/confignotifymax.c [new file with mode: 0644]
tools/themetoxml/.svnignore [new file with mode: 0644]