]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'tests-optimize' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 10 Aug 2011 13:57:28 +0000 (15:57 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 10 Aug 2011 13:57:28 +0000 (15:57 +0200)
1  2 
src/ipc.c

diff --cc src/ipc.c
Simple merge