]> icculus.org git repositories - dana/openbox.git/commit
Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 9 Dec 2009 22:07:42 +0000 (17:07 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 9 Dec 2009 22:07:42 +0000 (17:07 -0500)
commit7ab904b8873ec19109fc76a7c98878fe461a629a
tree4001b0dcd4f75eb80a62d65fe2b56641e7950e9f
parent8ba9884fd7406e579ba884794e4ec6539afcf947
parent81eb4752fe13e05d4bef2eef322617f1a7d4029f
Merge branch 'backport' into 3.4-working

Conflicts:

openbox/screen.h
data/rc.xml
openbox/client.c
openbox/config.c
openbox/config.h
openbox/screen.h