Merge pull request #3342 from orestisf1993/tree_close_internal

author Ingo Bürk <admin@airblader.de>

Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)

committer GitHub <noreply@github.com>

Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)
author Ingo Bürk <admin@airblader.de>
Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)
committer GitHub <noreply@github.com>
Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)
diff --cc src/con.c
Simple merge
diff --cc src/floating.c
Simple merge
diff --cc src/handlers.c
Simple merge
diff --cc src/randr.c
Simple merge
diff --cc src/tree.c
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)
committer	GitHub <noreply@github.com>
	Fri, 14 Sep 2018 10:24:54 +0000 (12:24 +0200)
		1	2
src/con.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/floating.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/handlers.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/randr.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/tree.c	patch \|	diff1 \|	diff2 \|	blob \| history