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

projects / dana / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 76fcb47 746859c)

author	Dana Jansens <danakj@orodu.net>
	Sat, 2 Feb 2008 16:36:17 +0000 (11:36 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Sat, 2 Feb 2008 16:37:35 +0000 (11:37 -0500)
commit	0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8
tree	0fe4df591efed9b1d50607ac1ec1d45565714403	tree \| snapshot
parent	76fcb473fa801728badf916cfebe349822759056	commit \| diff
parent	746859c1017e9cdf73eb91470e795f0c4b98b21a	commit \| diff

Merge branch 'backport' into work

Conflicts:

openbox/client.c
openbox/event.c
openbox/mouse.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
parser/parse.h

12 files changed:

obt/prop.c	diff1 \|	\|	blob \| history
obt/prop.h	diff1 \|	\|	blob \| history
openbox/actions.c	diff1 \|	diff2 \|	blob \| history
openbox/actions.h	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/keyboard.c	diff1 \|	diff2 \|	blob \| history
openbox/mouse.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager