]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 11:37:33 +0000 (13:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 17 Aug 2011 11:37:33 +0000 (13:37 +0200)
commit4cf2cab626d16d1b9de3dc93e0a8ebb1da8a0351
tree94891ca86ad4556f1b1b057ab7a4786648f20a10
parent2eab8d7f2007d824de8aff6cde94d3eeb799c015
parent84afc79e0b4d2594725be0d63f8508fdf848f249
Merge branch 'master' into next
src/main.c