]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 00:51:14 +0000 (20:51 -0400)
commit3618d922c5c890ae84e7980d94287ac1e631b021
tree25862ea53bd02c972baf68d007b63e155567670f
parent7823b90532c17799aa9c4b0896bbea2e5a664cf5
parent4fa86a7073489f436ef1a2bc4dbdccacca461195
Merge branch 'master' into 3.4-working
openbox/config.c
openbox/frame.c