Michael Stapelberg 2f116df901 Merge branch 'master' into next		2011-08-12 23:11:13 +02:00
..
doc	Mac OS X fixes: include string.h, add strndup(), disable xmllint for the docs	2011-08-01 16:17:59 +02:00
include	i3bar: Fixup indentions	2011-08-12 18:43:09 +02:00
src	Merge branch 'master' into next	2011-08-12 23:11:13 +02:00
.gitignore	Mention the color-options in the manpage	2010-11-04 12:43:41 +01:00
CHANGELOG	Update changelog and copyright, bump version and more	2011-07-31 16:16:17 +02:00
LICENSE	Update changelog and copyright, bump version and more	2011-07-31 16:16:17 +02:00
Makefile	make i3bar use i3’s common.mk	2011-08-01 16:13:19 +02:00