Michael Stapelberg 54222d5617 Merge branch 'master' into next

2012-04-22 20:11:25 +02:00

..

doc

i3bar: update manpage

2011-10-20 22:55:24 +01:00

include

Added option to select primary display on tray_output

2012-04-05 14:42:07 +02:00

src

Merge branch 'master' into next

2012-04-22 20:11:25 +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

introduce sasprintf() in libi3, use it everywhere

2011-10-23 13:16:56 +01:00