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

projects / dana / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4435c3a 307befd)

author	Dana Jansens <danakj@orodu.net>
	Thu, 7 Feb 2008 07:06:42 +0000 (02:06 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Thu, 7 Feb 2008 07:06:42 +0000 (02:06 -0500)
commit	5f04ca85ef6a2ebc2d66842e261a676691e9b4de
tree	5d28851a47a36a7130426644573f0fe1b1a6b5e8	tree \| snapshot
parent	4435c3a438f092252f563d5fd97dffd440a164db	commit \| diff
parent	307befd333dd89a990e541c37c8c3717e125dcdf	commit \| diff

Merge branch 'backport' into work

Conflicts:

openbox/config.c

data/rc.xml	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/config.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/menuframe.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/place.c	diff1 \|	diff2 \|	blob \| history
openbox/stacking.c	diff1 \|	diff2 \|	blob \| history
render/theme.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager