Michael Stapelberg cd0cd0c3d2 Merge branch 'master' into next		2014-01-13 23:35:22 +01:00
..
include	Fix 'gcc -Wextra -Wno-unused-parameter'.	2014-01-04 20:43:30 +01:00
src	Merge branch 'master' into next	2014-01-13 23:35:22 +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	Add stub Makefiles to allow subdir make calls	2012-07-22 19:57:48 +02:00
i3bar.mk	fix compilation with older xcb-util with -DXCB_COMPAT (Thanks okraits)	2012-09-03 14:55:27 +02:00