merge r5885-5886 from trunk
authorDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 19:27:47 +0000 (19:27 +0000)
committerDana Jansens <danakj@orodu.net>
Tue, 24 Apr 2007 19:27:47 +0000 (19:27 +0000)
commite17794a6a4675ce6f231b469abebf99e6884dae7
tree02c4a425801f901f8039108907703b37c90e161e
parente73a5742cf210e0b1325ded0b8beaa5d04683b6f
merge r5885-5886 from trunk
openbox/client.c
tests/mapiconic.c [new file with mode: 0644]