]> icculus.org git repositories - dana/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:13:24 +0000 (09:13 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 13:13:24 +0000 (09:13 -0400)
commita5b6a10c73671b6162ee2de0b411249da2e25521
tree02aa835a0eac212ff965ff87ce8d14a62e91beb3
parent2edcf596f54c633a21462936cfe5cbd332d82b6f
parentb3e333d67a80e3f53519ad348eab148c31666be2
Merge branch 'master' into 3.4-working