Michael Stapelberg 2daa8d422a Merge branch 'master' into next ...

Conflicts:
	i3-config-wizard/main.c

2012-02-10 00:03:18 +00:00

..

atoms.xmacro

i3-config-wizard: use a managed, floating (dialog) window. fixes focus problems

2011-07-27 13:28:32 +02:00

cfgparse.l

wizard: actually write the output config

2011-05-01 13:56:35 +02:00

cfgparse.y

introduce sasprintf() in libi3, use it everywhere

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

main.c

Merge branch 'master' into next

2012-02-10 00:03:18 +00:00

Makefile

Makefiles: introduce $(FLEX) and $(BISON)

2011-11-22 00:01:01 +00:00

xcb.h

get rid of xcb.c in all i3-* tools

2011-10-23 23:20:57 +01:00