Michael Stapelberg 1f2c9306a2 Merge branch 'master' into next ...

Conflicts:
	testcases/t/159-socketpaths.t

2011-12-18 18:02:08 +00:00

..

GPN-2009-06-27

…

NoName-2009-03-12

…

asciidoc-git.conf

docs/Makefile: use $(ASCIIDOC), add asciidoc 'latest git docs' config

2011-10-15 23:32:04 +01:00

bigpicture.png

…

bigpicture.xcf

…

debugging

…

hacking-howto

hacking-howto: talk about the tree data structure

2011-11-30 20:55:48 +00:00

i3-sync-working.dia

Add docs/testsuite

2011-09-24 20:10:01 +01:00

i3-sync-working.png

Add docs/testsuite

2011-09-24 20:10:01 +01:00

i3-sync.dia

Add docs/testsuite

2011-09-24 20:10:01 +01:00

i3-sync.png

Add docs/testsuite

2011-09-24 20:10:01 +01:00

ipc

Merge branch 'master' into next

2011-12-18 18:02:08 +00:00

keyboard-layer1.png

…

keyboard-layer1.svg

…

keyboard-layer2.png

…

keyboard-layer2.svg

…

Makefile

docs/Makefile: use $(ASCIIDOC), add asciidoc 'latest git docs' config

2011-10-15 23:32:04 +01:00

modes.png

…

multi-monitor

update docs/multi-monitor to include the output names and refer to the force_xinerama config directive

2011-09-19 23:21:38 +01:00

refcard.tex

…

single_terminal.png

…

snapping.png

…

stacklimit.png

…

testsuite

update docs/testsuite with the simpler invocation of complete-run.pl

2011-11-07 23:22:41 +00:00

tree-layout1.png

…

tree-layout2.png

…

tree-shot1.png

…

tree-shot2.png

…

tree-shot3.png

…

tree-shot4.png

…

two_columns.png

…

two_terminals.png

…

userguide

Merge branch 'master' into next

2011-12-18 18:02:08 +00:00

wsbar

…

wsbar.dia

…

wsbar.png

…