git.openbox.org Git - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a93b00a 8ada991)

author	Dana Jansens <danakj@orodu.net>
	Wed, 16 Dec 2009 20:39:25 +0000 (15:39 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Wed, 16 Dec 2009 20:39:25 +0000 (15:39 -0500)
commit	50d662681160c309ea86268c0d05794b87b75593
tree	f8ee31f3becc85527581072f9ab1ee6486f62465	tree \| snapshot
parent	a93b00a5e93281c7c2c31112f0b6b827d605a19d	commit \| diff
parent	8ada991d829671ab5e6dd4c5526b6a0238ba6a16	commit \| diff

Merge branch 'backport' into work

Conflicts:

obt/keyboard.c
obt/keyboard.h
openbox/event.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c

16 files changed:

obt/keyboard.c	diff1 \|	diff2 \|	blob \| history
obt/keyboard.h	diff1 \|	diff2 \|	blob \| history
openbox/actions/cyclewindows.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/directionalwindows.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/focus_cycle_popup.c	diff1 \|	diff2 \|	blob \| history
openbox/keyboard.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.h	diff1 \|	diff2 \|	blob \| history
openbox/prompt.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.h	diff1 \|	diff2 \|	blob \| history
render/image.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager