]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Mar 2014 19:59:18 +0000 (20:59 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 8 Mar 2014 19:59:18 +0000 (20:59 +0100)
commitb28ddca96d58689e50becd33de8a4031f520befd
tree850b78212ee81296978c07fff7ff47de4ac9fc19
parentd5cf494ba26d6dffde002907d620736e6c71adf7
parent89be6cb509c5b42b1ced48b27939e5a63ef43a0c
Merge branch 'master' into next
src/ipc.c