]> git.sur5r.net Git - i3/i3/commit
Merge branch 'desktop-file'
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)
commit393a1c085123ff520875bee1d953702035984f59
tree7ac9543998e55b503b0a04a172d908e04850a6f8
parent7e313b0385f18ad5c08f71d2a39ec1cb9d9de401
parent9fa0dc657b44118fae0d016fb85fa1f4c425503f
Merge branch 'desktop-file'