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
..
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-channel	2015-07-15 01:57:07 -07:00
.gitignore	Updated gitignore.	2014-06-23 12:57:30 +02:00
CMakeLists.txt	android: use target SDK version for appcompat	2014-11-15 01:04:57 +01:00
ModuleOptions.cmake	freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers	2013-09-03 20:37:04 -04:00