Michael Stapelberg 5cbe2d63c0 Merge branch 'master' into next		2014-07-02 19:06:23 +02:00
..
include	clang-format-3.5 **/*.h **/*.c	2014-06-19 11:20:32 +02:00
src	Merge branch 'master' into next	2014-07-02 19:06:23 +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
i3bar.mk	Switch to xcb-xkb and libxkbcommon	2014-06-21 19:10:37 +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