From: Dana Jansens <danakj@orodu.net>
Date: Thu, 31 Jan 2008 17:36:06 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;ds=inline;h=20b8fcfa33feeade5946bc7f3046705da5d164fe;hp=20b8fcfa33feeade5946bc7f3046705da5d164fe;p=chaz%2Fopenbox

Merge branch 'backport' into work

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
---