Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 15:53:12 +0000 (10:53 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 15:53:12 +0000 (10:53 -0500)
1  2 
openbox/prop.h

diff --cc openbox/prop.h
Simple merge