]> icculus.org git repositories - dana/openbox.git/commit
projects / dana / openbox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cfe36a0 c716d17)
Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:43:32 +0000 (17:43 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:43:32 +0000 (17:43 +0100)
commitec328fc04fe6e8d8c3d1ee386d4964963eb2ee17
treec91070084eee7915dd29453076dc7f30b5b97fa0tree
parentcfe36a0df2db3e5fd4c52e32093ea095492297cfcommit | diff
parentc716d1788bb4f4b9db403617023f06347ba48102commit | diff
Merge branch 'backport' into work

Conflicts:

obt/keyboard.c
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/frame.c
openbox/openbox.c
17 files changed:
openbox/actions.c diff1 | diff2 | blob | history
openbox/actions/cyclewindows.c diff1 | diff2 | blob | history
openbox/actions/desktop.c diff1 | diff2 | blob | history
openbox/actions/directionalwindows.c diff1 | diff2 | blob | history
openbox/client.c diff1 | diff2 | blob | history
openbox/config.h diff1 | diff2 | blob | history
openbox/event.c diff1 | diff2 | blob | history
openbox/focus.c diff1 | diff2 | blob | history
openbox/focus_cycle.c diff1 | diff2 | blob | history
openbox/frame.c diff1 | diff2 | blob | history
openbox/keyboard.c diff1 | diff2 | blob | history
openbox/menu.c diff1 | diff2 | blob | history
openbox/menuframe.c diff1 | diff2 | blob | history
openbox/moveresize.c diff1 | diff2 | blob | history
openbox/prompt.c diff1 | diff2 | blob | history
openbox/session.c diff1 | diff2 | blob | history
render/theme.c diff1 | diff2 | blob | history
Openbox Window Manager