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
..
client	Merge remote-tracking branch 'upstream/master' into mh-stream-fix	2015-06-18 03:06:40 -07:00
ChannelOptions.cmake	Android: Added SDCard redirection support	2013-04-25 07:30:33 -07:00
CMakeLists.txt	channels/drive: renamed to drive from disk for consistency with mstsc and accuracy (drive is more of a generic term, while disk does not apply to all)	2012-11-02 19:59:07 -04:00