Merge pull request #4414 from akallabeth/pthread_cleanup_fix

author Martin Fleisz <martin.fleisz@thincast.com>

Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)

committer GitHub <noreply@github.com>

Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)
author Martin Fleisz <martin.fleisz@thincast.com>
Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)
committer GitHub <noreply@github.com>
Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)
diff --cc client/Wayland/wlfreerdp.c
Simple merge
diff --cc rdtk/sample/rdtk_x11.c
Simple merge
author	Martin Fleisz <martin.fleisz@thincast.com>
	Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)
committer	GitHub <noreply@github.com>
	Thu, 15 Feb 2018 10:02:37 +0000 (11:02 +0100)
		1	2
client/Wayland/wlfreerdp.c	patch \|	diff1 \|	diff2 \|	blob \| history
rdtk/sample/rdtk_x11.c	patch \|	diff1 \|	diff2 \|	blob \| history