Michael Stapelberg 201268d9b2 Merge branch 'master' into next		2011-10-03 19:31:12 +01:00
..
doc	escape font name	2011-10-03 19:30:47 +01:00
include	Fix compilation with xcb 0.3.6	2011-08-24 01:18:27 +02:00
src	Merge branch 'master' into next	2011-09-19 19:20:18 +01: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