merge 7271
authorDana Jansens <danakj@orodu.net>
Sat, 2 Jun 2007 21:04:47 +0000 (21:04 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 2 Jun 2007 21:04:47 +0000 (21:04 +0000)
commit8d3b61ef3be51065b8251e11045c4008fc5af191
treee32914e89eabef0ccf26dcbf3aa34933dd23e7cf
parentbe7edee98b498de3932c9ef38335b5a89217c859
merge 7271
openbox/frame.c
openbox/frame.h