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
..
freerdp	Merge remote-tracking branch 'upstream/master' into mh-stream-fix	2015-06-18 03:06:40 -07:00
CMakeLists.txt	libfreerdp-rail: remove	2014-11-12 19:51:17 -05:00