Michael Stapelberg 2f116df901 Merge branch 'master' into next		2011-08-12 23:11:13 +02:00
..
child.c	i3bar: Fixup indentions	2011-08-12 18:43:09 +02:00
ipc.c	Mac OS X fixes: include string.h, add strndup(), disable xmllint for the docs	2011-08-01 16:17:59 +02:00
main.c	make i3bar use i3’s common.mk	2011-08-01 16:13:19 +02:00
outputs.c	little comment spelling fixes	2011-08-12 23:09:59 +02:00
ucs2_to_utf8.c	i3bar: Fixup indentions	2011-08-12 18:43:09 +02:00
workspaces.c	little comment spelling fixes	2011-08-12 23:09:59 +02:00
xcb.c	little comment spelling fixes	2011-08-12 23:09:59 +02:00