]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'next' of zekjur:/git/i3 into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 25 Jul 2009 20:31:01 +0000 (22:31 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 25 Jul 2009 20:31:01 +0000 (22:31 +0200)
1  2 
include/xcb.h
src/xcb.c

diff --cc include/xcb.h
Simple merge
diff --cc src/xcb.c
Simple merge