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)
1  2 
Makefile.am
openbox/screen.c

diff --cc Makefile.am
Simple merge
Simple merge