Martin Haimberger 6e4e1c2773 Merge remote-tracking branch 'upstream/master' into mh-stream-fix ...

Conflicts:
	client/Windows/wf_cliprdr.c

2015-06-18 03:06:40 -07:00

..

aFreeRDP

Recompressed images with FileOptimizer 6.8 (an open-source mass file recompression tool for Windows)

2014-08-08 20:12:25 -04:00

FreeRDPCore

Merge remote-tracking branch 'upstream/master' into mh-stream-fix

2015-06-18 03:06:40 -07:00

.gitignore

…

CMakeLists.txt

android: use target SDK version for appcompat

2014-11-15 01:04:57 +01:00

ModuleOptions.cmake

…