FreeRDP/channels
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
..
audin Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
client changed returnvalues of DeviceServiceEntry to WIN32ERROR 2015-06-18 03:04:32 -07:00
cliprdr Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
disp hardend display channel 2015-06-18 03:04:32 -07:00
drdynvc introduced channel error reporting system 2015-07-15 00:50:35 -07:00
drive Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
echo introduced channel error reporting system 2015-07-15 00:50:35 -07:00
encomsp introduced channel error reporting system 2015-07-15 00:50:35 -07:00
parallel introduced channel error reporting system 2015-07-15 00:50:35 -07:00
printer Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
rail introduced channel error reporting system 2015-07-15 00:50:35 -07:00
rdpdr introduced channel error reporting system 2015-07-15 00:50:35 -07:00
rdpei introduced channel error reporting system 2015-07-15 00:50:35 -07:00
rdpgfx Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
rdpsnd Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
remdesk Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
serial introduced channel error reporting system 2015-07-15 00:50:35 -07:00
server Add server-side RDPEI 2014-11-20 22:19:29 +01:00
smartcard introduced channel error reporting system 2015-07-15 00:50:35 -07:00
tsmf Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
urbdrc Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
CMakeLists.txt build: cmake 3.1 compatibility 2014-12-12 19:26:22 +01:00