From: Mikael Magnusson Date: Sat, 8 Mar 2008 16:29:04 +0000 (+0100) Subject: Merge branch 'wip/edges' into wip/mikabox X-Git-Tag: mikabox-3.4.7.2~59 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=05a0452fa214495af24fff3f7044bdd2775a35ec;p=mikachu%2Fopenbox.git Merge branch 'wip/edges' into wip/mikabox --- 05a0452fa214495af24fff3f7044bdd2775a35ec