]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 10 Jul 2014 22:33:13 +0000 (00:33 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 10 Jul 2014 22:33:13 +0000 (00:33 +0200)
commitc2ccfc7e6088153c3846ea6b525cd41a6606ae72
tree0c4471f5760ab86e37d4484930d5f79446fda04d
parent8e23dc881b33f1b5a434db89b804f935ff146bbb
parent931dda2d0bf72ab81bf9394a1b04872d35dc46c2
Merge branch 'master' into next
i3bar/src/child.c