]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 8 Aug 2014 18:16:40 +0000 (20:16 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 8 Aug 2014 18:16:40 +0000 (20:16 +0200)
commit89d3f93bec03547cf5b07b1e120aa07374b2dd64
treed4ce7b7358e7087a19c25ea2ff512392653b179e
parent294d52e0180ea81bd18606fa604486026855691a
parentfa41ad7e218d1497a749eb59983f3dd162ddbe29
Merge branch 'master' into next
src/con.c