]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 22:05:15 +0000 (23:05 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 23 Jan 2014 22:05:15 +0000 (23:05 +0100)
commit00cf2b21daa5bd5973f52cb1ac7a3852bf69f7cc
tree1c7779c4817ed23ef173ffd0cfd244995dfcb7ca
parenta708da684fd2d1e580141a7d5a701fb484c38d9e
parentda12c9f591f936c17dbdbe7a3f8f46bdafaf7476
Merge branch 'master' into next