]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 22 Nov 2013 16:09:28 +0000 (17:09 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 22 Nov 2013 16:09:28 +0000 (17:09 +0100)
commit1dbdd4fece86c5f85bde54e40f58fa1a91810933
tree87c8d87cfcb30045ee5d3e640428bcafe490db9a
parentd3beff23395356ec71fcc35a3b802163e12df73e
parentfd07f989fdf441ef335245dd3436a70ff60e8896
Merge branch 'master' into next
src/con.c