Dogcows Code - chaz/openbox/commit

]> Dogcows Code - chaz/openbox/commit

author	Dana Jansens <danakj@orodu.net>
	Tue, 8 Dec 2009 19:19:04 +0000 (14:19 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Tue, 8 Dec 2009 19:19:04 +0000 (14:19 -0500)
commit	2f09e0ce388f63c341cb328d795766e2bd0dc24b
tree	14fb36919947e80ba0dfc151d0f1f02ed46fd712	tree \| snapshot
parent	84843c3f9842046e34366202f1a8f80ce8565f91	commit \| diff
parent	672aea85cfe2ac2bc8cb4e3f34fd023f10d90182	commit \| diff

Merge branch 'backport' into work

Conflicts:

openbox/actions/all.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/grab.c

my patches for the openbox window manager

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