more mis-merging
authorDana Jansens <danakj@orodu.net>
Wed, 16 May 2007 17:10:39 +0000 (17:10 +0000)
committerDana Jansens <danakj@orodu.net>
Wed, 16 May 2007 17:10:39 +0000 (17:10 +0000)
commit43b93cab3e7605477d07a77292ba619cb05fb664
treeb705e4e517115ac2a6f4ad230f3db5e26d48930a
parent9dca960996fb2e48fa59c1313309c189a417e099
more mis-merging
doc/openbox.1.in
openbox/client_menu.c
openbox/stacking.c