]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 29 Oct 2012 15:42:11 +0000 (16:42 +0100)
commit71ccb4bef2850bd5beab8a4ef4669bf53b5a9781
tree76912fbfb8d78a29ebeb38ef17307d66031937b6
parent7c94e32819ab940d3c49714a922a8981a4c22881
parenteb8c21a5b8629bcda9218512d80ec7464d2c6dad
Merge branch 'master' into next
include/data.h
src/x.c