merge r5829,r5830 to 3.4-working
authorMikael Magnusson <mikachu@comhem.se>
Mon, 23 Apr 2007 19:10:45 +0000 (19:10 +0000)
committerMikael Magnusson <mikachu@comhem.se>
Mon, 23 Apr 2007 19:10:45 +0000 (19:10 +0000)
commit10ef8dbaa7cd360394f3a0dcb5c15b9665487304
tree91530abe06868eb2d94fa8c0abf157c2406a3a36
parentd1923b53228d1a25f93d517d4a874bee6706883d
merge r5829,r5830 to 3.4-working
openbox/client.c
openbox/client.h
openbox/prop.c
openbox/prop.h