Merge commit 'dd6d82955087e1b53c8d9f1a7a5b252c8a545210^' into httpproxy
authorChristian Plattner <ccpp@gmx.at>
Mon, 19 Jan 2015 20:20:38 +0000 (21:20 +0100)
committervoxelmaster <voxelmaster@rhinospider.tilak.cc>
Mon, 19 Jan 2015 20:23:37 +0000 (21:23 +0100)
commitc20b48781580a921c5e077fbd9d90be15ff35425
treed37726448d8813c5e1ad14bcd4fcfdfc64505494
parent5152a8a483ec6aa6696a80a6277c69bdf76f4d36
parent0376dcd065a5afc87ac9d4b2ef702b12f6fe09cd
Merge commit 'dd6d82955087e1b53c8d9f1a7a5b252c8a545210^' into httpproxy
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c
libfreerdp/core/CMakeLists.txt
libfreerdp/core/settings.c
libfreerdp/core/tcp.c
libfreerdp/core/transport.c