]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 28 Sep 2012 17:47:16 +0000 (19:47 +0200)
commit2252b4f5b956551ad4844deabee0ab38ccc73c99
tree8299d8df73e9daa764eb098c939f265a0d14d6ee
parent5d8e3f58f68749f2e88997e4deb94a2ef3dc1945
parent2d0b60bd58b66bc8fd8f23a0c95d22172ec22a72
Merge branch 'master' into next
src/x.c