Michael Stapelberg 8247f44e95 Merge branch 'master' into next		2013-04-14 22:54:36 +02:00
..
child.c	restore i3bar compatibility with libyajl version 1	2013-04-07 15:54:20 +02:00
config.c	Separator color via config; separator width and on/off via ipc	2013-02-18 10:44:44 +01:00
ipc.c	i3bar: set _NET_SYSTEM_TRAY_COLORS for symbolic icons (gtk3+)	2013-01-02 23:14:30 +01:00
main.c	i3bar: fix usage description, make -b happen	2013-03-29 09:55:03 +01:00
mode.c	i3bar: Add current binding mode indicator	2012-11-16 13:44:29 +01:00
outputs.c	Use (void) instead of () for functions without args	2012-08-23 19:34:37 +02:00
parse_json_header.c	Add click events to i3bar	2013-03-21 23:55:30 +01:00
workspaces.c	Use (void) instead of () for functions without args	2012-08-23 19:34:37 +02:00
xcb.c	Merge branch 'master' into next	2013-04-14 22:54:36 +02:00