]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 00:02:50 +0000 (02:02 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 00:02:50 +0000 (02:02 +0200)
commit6d91a6248e65e07848785ae74846c6fb0db8c4c2
tree1e7af4b80a4bd6a3fc40dd03e37326b2477d0b8a
parent6e6eb407e0814744e0d463b04f3f3ebc5b3203fd
parent194c220508fa8498ec7713c35ed4c886e265fc48
Merge branch 'master' into next
src/manage.c