]> icculus.org git repositories - mikachu/openbox.git/commit
projects / mikachu / openbox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7841a8 ea07bf7)
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)
commit5b6ee8d9def94e7767163d55d502e529e2dc48d4
tree49f63e4ba6681a1fa1539096565437a5f62b27c9tree
parente7841a8ee124c3d67aaab72934848f59a340e29bcommit | diff
parentea07bf7131a301130beb348359d10a624a2046a0commit | diff
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
Makefile.am diff1 | diff2 | blob | history
data/rc.xml diff1 | diff2 | blob | history
data/rc.xsd diff1 | diff2 | blob | history
openbox/actions/cyclewindows.c diff1 | diff2 | blob | history
openbox/actions/directionalwindows.c diff1 | diff2 | blob | history
openbox/config.c diff1 | diff2 | blob | history
openbox/frame.c diff1 | diff2 | blob | history
Openbox Window Manager