]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 14:02:55 +0000 (10:02 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 14:02:55 +0000 (10:02 -0400)
commit52dafaf4704bd03bcab90134dc52e2015b0efdc3
tree3becca31e4fe3a9c3af4ec7bbc059e47bda54811
parenta5b6a10c73671b6162ee2de0b411249da2e25521
parent20393474634c5454fe29cc6d95c970b2b2f21b1c
Merge branch 'master' into 3.4-working