Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 17 Dec 2009 15:33:39 +0000 (10:33 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 17 Dec 2009 15:33:39 +0000 (10:33 -0500)
commit501943b53d68821a752ceda3fbd9b64bbcae4a4c
treea2a2d4a8d5fd2976f4e1cfb7801c8adca457d19d
parent1a348576400b26dad3a58a81415c4c833fb4915c
parentd3347e8be3753b7a466353aece04a25992018c9a
Merge branch 'backport' into work
.gitignore
openbox/resist.c
openbox/screen.c