]> Dogcows Code - chaz/openbox/commitdiff
Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000 (19:41 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000 (19:41 +0100)
Conflicts:

openbox/actions/desktop.c
openbox/actions/if.c


No differences found
This page took 0.020309 seconds and 4 git commands to generate.