Michael Stapelberg 0c51b57b99 Merge branch 'master' into next		2011-09-19 19:20:18 +01:00
..
child.c	Merge branch 'master' into next	2011-08-25 18:51:02 +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	i3bar: properly handle the _XEMBED_INFO property	2011-08-24 01:18:27 +02:00
ucs2_to_utf8.c	i3bar: Fixup indentions	2011-08-12 18:43:09 +02:00
workspaces.c	i3bar: properly handle the _XEMBED_INFO property	2011-08-24 01:18:27 +02:00
xcb.c	Merge branch 'master' into next	2011-09-19 19:20:18 +01:00