]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'master' into 3.4
authorDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:12:10 +0000 (09:12 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:12:10 +0000 (09:12 -0400)
commitf65320b89a9907458c489ebe9b681cd17102aacf
treec8fda8d75383057416901878a5d640e339114cc6
parent936839eab1de283321384512beccf55dcbff9f4a
parentbc2c2bc3f08ba8b40db10761650633d9de7f1753
Merge branch 'master' into 3.4