From: Mikael Magnusson Date: Mon, 28 Apr 2008 22:26:47 +0000 (+0200) Subject: Merge branch 'wip/edges' into wip/mikabox X-Git-Tag: mikabox-3.4.7.2~41 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d26b34ed429b974ecece2ff3b0051fec21e84a10;p=mikachu%2Fopenbox.git Merge branch 'wip/edges' into wip/mikabox --- d26b34ed429b974ecece2ff3b0051fec21e84a10