Merge branch 'wip/edges' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Mon, 28 Apr 2008 22:26:47 +0000 (00:26 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Mon, 28 Apr 2008 22:26:47 +0000 (00:26 +0200)
1  2 
openbox/edges.c

diff --cc openbox/edges.c
Simple merge