]> icculus.org git repositories - dana/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:16:30 +0000 (14:16 -0400)
committerDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:16:30 +0000 (14:16 -0400)
commita4992a9a021746f70de1b6ab179e9970ab698d86
tree8e89a67da4589c747a5886cd53e549b88714f9b0
parent2328486d1428935b4cb45b4b9d4337d6dcb6b9b8
parentee8d27a6e8a8ca7fda22c4b1624fc18c92bfff97
Merge branch 'master' into 3.4-working