Merge pull request #1750 from ccpp/master
authorakallabeth <akallabeth@users.noreply.github.com>
Wed, 11 Jan 2017 10:02:00 +0000 (11:02 +0100)
committerGitHub <noreply@github.com>
Wed, 11 Jan 2017 10:02:00 +0000 (11:02 +0100)
commit3762401d4331e4051d5ff41b9e8b56f6eff0aa42
treeea895baaf9840878d93758a1df95db6449aa417f
parent72bcc7367e889ac9ea62dc9bcc5a8a13cdc12f29
parent8658f04f42ceb53b4fc9894e8222af03e4bae667
Merge pull request #1750 from ccpp/master

Support for HTTP-Proxy
client/common/cmdline.c
libfreerdp/common/settings.c
libfreerdp/core/gateway/rdg.c
libfreerdp/core/gateway/rpc.c