]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Jan 2014 11:20:12 +0000 (12:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 4 Jan 2014 11:20:12 +0000 (12:20 +0100)
commita32b6da71249a71487b5708e0f043e5cb3b146c1
treec4658f810d97f885534ba481d42227863b77f140
parent9c15b9504ec4c7201376781234e5611215d120ee
parent31c3505cbf9a5a337f55d2043bd090ed544b8eba
Merge branch 'master' into next
Makefile
src/i3.mk
src/main.c