Merge pull request #2507 from stapelberg/autotools

author Michael Stapelberg <stapelberg@users.noreply.github.com>

Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)

committer GitHub <noreply@github.com>

Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)
committer GitHub <noreply@github.com>
Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)
diff --cc i3bar/src/child.c
Simple merge
diff --cc src/con.c
Simple merge
diff --cc src/ipc.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)
committer	GitHub <noreply@github.com>
	Tue, 25 Oct 2016 06:56:12 +0000 (08:56 +0200)
		1	2
i3bar/src/child.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/con.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ipc.c	patch \|	diff1 \|	diff2 \|	blob \| history