]> git.sur5r.net Git - i3/i3/commit - include/i3/ipc.h
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 11:47:57 +0000 (13:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 27 Aug 2011 11:47:57 +0000 (13:47 +0200)
commit8114ecda478a39c787510bbe6d63f7d19f635da6
treeccdae79cd9085d74bb6ee37040dbf5e6b2b20cf8
parent6c42a179ecec101dfdd8da4916f7970d714925fe
parent9e46f7bd8f762c2928e50b88d2cd81ba5a6c56c4
Merge branch 'master' into next