Merge pull request #1816 from tcreech/tcreech-for-illumos

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

Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)

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

Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)
diff --cc i3-config-wizard/main.c
Simple merge
diff --cc include/libi3.h
Simple merge
diff --cc src/ipc.c
Simple merge
diff --cc src/util.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Tue, 4 Aug 2015 07:10:06 +0000 (00:10 -0700)
		1	2
i3-config-wizard/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/libi3.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/ipc.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.c	patch \|	diff1 \|	diff2 \|	blob \| history