]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 8 Sep 2015 07:19:33 +0000 (09:19 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 8 Sep 2015 07:19:33 +0000 (09:19 +0200)
commit14a4e0c6f8500b981ed36b3e772c65c3ca35749d
tree7b98b3bd5a2e8f6099acee2e72aaf747937292af
parentcc98f465f2c0d6664cc09a273f9fd324fa4cbecc
parentdbb34ade82e2f56ca98638f879c3a3c3240fc067
Merge branch 'master' into next