Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 01:12:18 +0000 (20:12 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 01:12:18 +0000 (20:12 -0500)
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

1  2 
Makefile.am
data/rc.xml
data/rc.xsd
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/config.c
openbox/frame.c

diff --cc Makefile.am
Simple merge
diff --cc data/rc.xml
Simple merge
diff --cc data/rc.xsd
Simple merge
Simple merge
index 71c0d37da6069c8a915ef0ec8df635ddde1a7d41,c575d84e2d056b5ae99fa21b12046d1839d07757..b93e12b7b8dbe9998e73059be88c5d76229b8483
@@@ -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"
  
Simple merge
diff --cc openbox/frame.c
Simple merge