Merge pull request #3022 from orestisf1993/i3bar-leaks

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

Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)

committer GitHub <noreply@github.com>

Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)
author Ingo Bürk <admin@airblader.de>
Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)
committer GitHub <noreply@github.com>
Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)
diff --cc i3bar/src/config.c
Simple merge
diff --cc i3bar/src/xcb.c
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)
committer	GitHub <noreply@github.com>
	Sun, 3 Dec 2017 18:51:25 +0000 (19:51 +0100)
		1	2
i3bar/src/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
i3bar/src/xcb.c	patch \|	diff1 \|	diff2 \|	blob \| history