Merge pull request #1570 from shdown/next

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

Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)

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

Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)
author Michael Stapelberg <stapelberg@users.noreply.github.com>
Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)
committer Michael Stapelberg <stapelberg@users.noreply.github.com>
Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)
diff --cc i3bar/src/child.c
Simple merge
diff --cc i3bar/src/xcb.c
Simple merge
author	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)
committer	Michael Stapelberg <stapelberg@users.noreply.github.com>
	Mon, 23 Mar 2015 21:10:17 +0000 (22:10 +0100)
		1	2
i3bar/src/child.c	patch \|	diff1 \|	diff2 \|	blob \| history
i3bar/src/xcb.c	patch \|	diff1 \|	diff2 \|	blob \| history