Merge pull request #5396 from widgetii/master

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

Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +0200)

committer GitHub <noreply@github.com>

Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +0200)
author Martin Fleisz <martin.fleisz@thincast.com>
Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +0200)
committer GitHub <noreply@github.com>
Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +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
author	Martin Fleisz <martin.fleisz@thincast.com>
	Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 Jul 2019 14:17:29 +0000 (16:17 +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