]> icculus.org git repositories - dana/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 14:21:28 +0000 (10:21 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 14:21:28 +0000 (10:21 -0400)
commite236e0160e0ea5d28062662caf4dd0f8f1aee65d
treeeb65d1897e4488f8e76b1232d2b0a19b5164c97e
parentfc64207ed3496fa5be61c89b1f2e9f9d32336599
parent098ae047f89f23d888f26425f7c5f77b75437d91
Merge branch 'master' into 3.4-working