Dogcows Code - chaz/openbox/commit

]> Dogcows Code - chaz/openbox/commit - data/rc.xml

author	Charles McGarvey <chazmcgarvey@brokenzipper.com>
	Fri, 26 Oct 2012 19:03:24 +0000 (13:03 -0600)
committer	Charles McGarvey <chazmcgarvey@brokenzipper.com>
	Fri, 26 Oct 2012 19:03:24 +0000 (13:03 -0600)
commit	9325c92056ff4268db2263cdf8c07bb529e158aa
tree	cb5164f94c8e3b8cf6505b9ca4c753622c432345	tree \| snapshot
parent	32c93f09f03bd2d7c7bf3408febbe9fa7f8dd1cc	commit \| diff
parent	782b2864b1cc5ffab426dfb784a973576a98de18	commit \| diff

Merge branch 'master' into chaz

Conflicts:
openbox/config.c

my patches for the openbox window manager

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