FreeRDP/channels/rdpgfx
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 channels/rdpgfx: create empty channel client stub 2013-10-21 22:53:55 -04:00
CMakeLists.txt channels/rdpgfx: create empty channel client stub 2013-10-21 22:53:55 -04:00