From: Dana Jansens <danakj@orodu.net>
Date: Fri, 25 Jan 2008 01:12:18 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6~17
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5b6ee8d9def94e7767163d55d502e529e2dc48d4;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/cyclewindows.c
	openbox/actions/directionalwindows.c
	po/ar.po
	po/bn_IN.po
	po/ca.po
	po/cs.po
	po/de.po
	po/es.po
	po/et.po
	po/fi.po
	po/fr.po
	po/it.po
	po/nl.po
	po/no.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/sk.po
	po/ua.po
	po/vi.po
	po/zh_CN.po
	po/zh_TW.po
---

5b6ee8d9def94e7767163d55d502e529e2dc48d4
diff --cc openbox/actions/directionalwindows.c
index 71c0d37d,c575d84e..b93e12b7
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@@ -1,8 -1,9 +1,10 @@@
  #include "openbox/actions.h"
  #include "openbox/event.h"
+ #include "openbox/stacking.h"
+ #include "openbox/window.h"
  #include "openbox/focus_cycle.h"
  #include "openbox/openbox.h"
 +#include "openbox/client.h"
  #include "openbox/misc.h"
  #include "gettext.h"