Merge branch 'gateway-http-bugfix'
authorChristian Plattner <ccpp@gmx.at>
Fri, 9 Dec 2016 19:43:02 +0000 (20:43 +0100)
committerChristian Plattner <ccpp@gmx.at>
Fri, 9 Dec 2016 19:43:02 +0000 (20:43 +0100)
commit5d10b3bf5b80ca2859a00fdb04359bb28511c477
tree62645ca12029e8215194e03a0d193a1e6c36aaea
parent49a6273c91019b7fe8408b3859f7e6f708df1a90
parentb6e97cbad43f19748b60956a21b667a821cafb18
Merge branch 'gateway-http-bugfix'

Conflicts:
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c
libfreerdp/core/settings.c
libfreerdp/core/tcp.c
libfreerdp/core/transport.c
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c
libfreerdp/core/CMakeLists.txt
libfreerdp/core/gateway/rdg.c
libfreerdp/core/gateway/rpc.c
libfreerdp/core/proxy.c
libfreerdp/core/settings.c
libfreerdp/core/transport.c