Martin Haimberger 6ab0187d84 Merge remote-tracking branch 'upstream/master' into mh-channel ... Conflicts: channels/audin/client/oss/audin_oss.c channels/drive/client/drive_main.c channels/printer/client/printer_cups.c channels/printer/client/printer_main.c channels/rail/client/rail_main.c channels/rdpgfx/client/rdpgfx_main.c channels/rdpsnd/client/oss/rdpsnd_oss.c channels/remdesk/client/remdesk_main.c channels/remdesk/server/remdesk_main.c channels/tsmf/client/tsmf_media.c		2015-07-15 01:57:07 -07:00
..
client	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -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