Merge branch 'backport'
authorDana Jansens <danakj@orodu.net>
Sun, 10 Feb 2008 00:07:55 +0000 (19:07 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 10 Feb 2008 00:07:55 +0000 (19:07 -0500)
commit3167fc223ea82851ae954b348a5ff1c0ce6b6d79
tree86994de780d3a777f995a586e0829cdea9fd8e2f
parentf86fa2b3b49b1e790e84bd041f3e91cb63f369a4
parentb2e52c7b48ee64213b4d9e3fbab0d35f66410122
Merge branch 'backport'
Makefile.am
openbox/screen.c