]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jun 2014 07:05:32 +0000 (09:05 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 27 Jun 2014 07:05:32 +0000 (09:05 +0200)
commit01a2c5a3f16be97f1afe9cb40d802c4f8deed86c
treebcf93e9b14d2f755f1e58eee2a199532dd90e8c0
parent80007828c3046dc8617c0044f80bf1b0e8ebc3c1
parent3b546d00f76647e50c6e3c3744ab5a4f30e7a698
Merge branch 'master' into next
include/ipc.h
src/commands.c
src/ipc.c