Merge pull request #4815 from akallabeth/async_transport_remove

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

Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)

committer GitHub <noreply@github.com>

Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)
author Martin Fleisz <martin.fleisz@thincast.com>
Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)
committer GitHub <noreply@github.com>
Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)
diff --cc client/common/cmdline.c
Simple merge
diff --cc client/common/cmdline.h
Simple merge
diff --cc include/freerdp/settings.h
Simple merge
diff --cc libfreerdp/core/transport.c
Simple merge
author	Martin Fleisz <martin.fleisz@thincast.com>
	Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)
committer	GitHub <noreply@github.com>
	Fri, 24 Aug 2018 07:48:51 +0000 (09:48 +0200)
		1	2
client/common/cmdline.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/common/cmdline.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/freerdp/settings.h	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp/core/transport.c	patch \|	diff1 \|	diff2 \|	blob \| history