Michael Stapelberg 1f2c9306a2 Merge branch 'master' into next ... Conflicts: testcases/t/159-socketpaths.t		2011-12-18 18:02:08 +00:00
..
Makefile	add i3-dump-log, a tool to dump the SHM log	2011-12-10 11:27:40 +00:00
asciidoc.conf	bump manpage version to 4.1	2011-11-11 22:33:45 +00:00
i3-config-wizard.man	add a manpage for i3-config-wizard	2011-07-31 23:08:25 +02:00
i3-dump-log.man	add i3-dump-log, a tool to dump the SHM log	2011-12-10 11:27:40 +00:00
i3-input.man	i3-input: update manpage	2011-09-18 13:57:39 +01:00
i3-migrate-config-to-v4.man	add a manpage for i3-migrate-config-to-v4	2011-07-31 23:22:50 +02:00
i3-msg.man	Use I3SOCK-environment-variable	2011-01-12 10:15:48 +01:00
i3-nagbar.man	add i3-nagbar. tells you about config file errors (for example)	2011-07-10 14:33:19 +02:00
i3-sensible-editor.man	Add manpages for i3-sensible-{pager,editor,terminal}	2011-11-11 22:29:10 +00:00
i3-sensible-pager.man	Add manpages for i3-sensible-{pager,editor,terminal}	2011-11-11 22:29:10 +00:00
i3-sensible-terminal.man	Add manpages for i3-sensible-{pager,editor,terminal}	2011-11-11 22:29:10 +00:00
i3.man	Merge branch 'master' into next	2011-12-18 18:02:08 +00:00