]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 5 Sep 2012 15:09:43 +0000 (17:09 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 5 Sep 2012 15:09:43 +0000 (17:09 +0200)
commit8d2799c251cc1c44f1429c36817c346fa56b9701
tree9c309abebf1a5ef27be56f093d0aa6bd41627b77
parent4976fa33504907510f1ee9e44884c116af0d801b
parent9436e6f26e971bb3beed3790e28c33b9a6eeedce
Merge branch 'master' into next
src/util.c