]> git.sur5r.net Git - i3/i3/commit - i3bar/include/child.h
Merge branch 'next'
authorAxel Wagner <mail@merovius.de>
Thu, 23 Dec 2010 15:34:19 +0000 (16:34 +0100)
committerAxel Wagner <mail@merovius.de>
Thu, 23 Dec 2010 15:34:19 +0000 (16:34 +0100)
commit94a8273b09de5b7b06c4b79eb7a41b934a43bc32
treeaf3bb254e28249661e5a02b942488be982ae8a16
parent17484d82f2b8a530badb8311341ef9e04df4f3ec
parenta3e37b059fafc5c1179bd656780935a2dded25df
Merge branch 'next'
i3bar/src/xcb.c