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)
commitaea7dd9c1afc1322788969ad5c5811dbea926442
tree4b6d9a5fd6449d8d575e6bf260a988ccc15879f8
parentb42618b8d9b65b3f40200ffbe628c3f86056faeb
parentfadc52e1869fbdda3d30a8131ca5c5c1da7c6e98
Merge branch 'backport' into 3.4-working
openbox/prop.h