]> Dogcows Code - chaz/openbox/commit
Merge branch 'master' into chaz
authorCharles McGarvey <chazmcgarvey@brokenzipper.com>
Thu, 14 Aug 2014 18:39:50 +0000 (12:39 -0600)
committerCharles McGarvey <chazmcgarvey@brokenzipper.com>
Thu, 14 Aug 2014 18:39:50 +0000 (12:39 -0600)
commitd67b818ae90c5574166d08422d3e9a68d8d65e16
tree2a82652a36a484baafb84f0a3a50b9912f0d2c88
parent9325c92056ff4268db2263cdf8c07bb529e158aa
parenteffa8667e1bcc62361d5d54cd0581e3294203f90
Merge branch 'master' into chaz

Conflicts:
openbox/moveresize.c
configure.ac
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.025458 seconds and 4 git commands to generate.