]> Dogcows Code - chaz/openbox/commitdiff
Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 31 Jan 2008 17:36:06 +0000 (12:36 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 31 Jan 2008 17:51:38 +0000 (12:51 -0500)
Conflicts:

openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c


No differences found
This page took 0.022601 seconds and 4 git commands to generate.