Dogcows Code - chaz/openbox/commit

]> Dogcows Code - chaz/openbox/commit

projects / chaz / openbox / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c02c825 ada5de2)

author	Dana Jansens <danakj@orodu.net>
	Sat, 21 Nov 2009 21:56:07 +0000 (16:56 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Sat, 21 Nov 2009 21:56:07 +0000 (16:56 -0500)
commit	4bf6b1b551be744be4fbe4d1faab5be12d051378
tree	a17c1404021df31757bc53fe35914182f389c1e1	tree \| snapshot
parent	c02c825cb8f18f0170b312ea8d4b3f4d491bff40	commit \| diff
parent	ada5de28f71efaa5584709673cc49cdb3b703299	commit \| diff

Merge branch 'backport' into work

Conflicts:
openbox/popup.c

openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/popup.c	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history

my patches for the openbox window manager

This page took 0.0316650000000001 seconds and 4 git commands to generate.