]> Dogcows Code - chaz/openbox/commit - openbox/menu.h
Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 7 Feb 2008 07:06:42 +0000 (02:06 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 7 Feb 2008 07:06:42 +0000 (02:06 -0500)
commit5f04ca85ef6a2ebc2d66842e261a676691e9b4de
tree5d28851a47a36a7130426644573f0fe1b1a6b5e8
parent4435c3a438f092252f563d5fd97dffd440a164db
parent307befd333dd89a990e541c37c8c3717e125dcdf
Merge branch 'backport' into work

Conflicts:

openbox/config.c
data/rc.xml
openbox/client.h
openbox/config.c
openbox/config.h
openbox/event.c
openbox/focus.c
openbox/menuframe.c
openbox/openbox.c
openbox/place.c
openbox/stacking.c
render/theme.c
This page took 0.034829 seconds and 4 git commands to generate.