Christian Plattner 5d10b3bf5b 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		2016-12-09 20:43:02 +01:00
..
freerdp	Merge branch 'gateway-http-bugfix'	2016-12-09 20:43:02 +01:00
CMakeLists.txt	cleanup cmake exports and pkg-config files	2016-01-12 17:32:33 +01:00