]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Jan 2015 17:20:43 +0000 (18:20 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Jan 2015 17:20:43 +0000 (18:20 +0100)
commit3b4ae812e3543681a331bb72e6ae50038c4ab7bc
treea7edc4f0132310a97c785acf2dcf1008aa53ae9c
parent69dd8ce3984063fbc8bf5f8884690a16748be9f6
parentf13fa1e37a33bab8ea9f8424ec4e488fa5df5d42
Merge branch 'master' into next

Conflicts:
src/render.c
src/render.c