]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 21:05:17 +0000 (17:05 -0400)
committerDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 21:05:17 +0000 (17:05 -0400)
commit7823b90532c17799aa9c4b0896bbea2e5a664cf5
treef1bb866dab47b3376da38c877686666514f2bc34
parentd6d360bae681df1bf93830a834fca9fafa332458
parent38fe5bf8dc1c9738838ee17225e3fcb4cc9eb17a
Merge branch 'master' into 3.4-working