Christian Plattner 5152a8a483 Merge commit '4c920506ed9985fdec0eb52fd2c40626458fd050' into httpproxy ...

Conflicts:
	include/freerdp/settings.h
	libfreerdp/common/settings.c
	libfreerdp/core/settings.c
	libfreerdp/core/transport.c

2015-01-19 21:13:24 +01:00

..

addin.c

Fixed coverity issue 1047619

2013-09-05 12:14:31 +02:00

CMakeLists.txt

freerdp: export targets

2013-10-28 23:06:39 -04:00

settings.c

Merge commit '4c920506ed9985fdec0eb52fd2c40626458fd050' into httpproxy

2015-01-19 21:13:24 +01:00