]> Dogcows Code - chaz/openbox/commit - openbox/menu.h
Merge branch 'master' into chaz
authorCharles McGarvey <chazmcgarvey@brokenzipper.com>
Fri, 26 Oct 2012 19:03:24 +0000 (13:03 -0600)
committerCharles McGarvey <chazmcgarvey@brokenzipper.com>
Fri, 26 Oct 2012 19:03:24 +0000 (13:03 -0600)
commit9325c92056ff4268db2263cdf8c07bb529e158aa
treecb5164f94c8e3b8cf6505b9ca4c753622c432345
parent32c93f09f03bd2d7c7bf3408febbe9fa7f8dd1cc
parent782b2864b1cc5ffab426dfb784a973576a98de18
Merge branch 'master' into chaz

Conflicts:
openbox/config.c
data/rc.xml
data/rc.xsd
openbox/client.c
openbox/client.h
openbox/config.c
openbox/config.h
openbox/frame.c
openbox/moveresize.c
This page took 0.024407 seconds and 4 git commands to generate.