Christian Plattner 33320a2e02 Merge remote-tracking branch 'upstream/master' into httpproxy ... Conflicts: libfreerdp/core/settings.c libfreerdp/core/tcp.c libfreerdp/core/transport.c		2015-01-22 14:33:17 +01:00
..
freerdp	Merge remote-tracking branch 'upstream/master' into httpproxy	2015-01-22 14:33:17 +01:00
CMakeLists.txt	libfreerdp-rail: remove	2014-11-12 19:51:17 -05:00