Martin Haimberger 420a86e1c7 Merge remote-tracking branch 'upstream/master' into mh-channel-fix ... Conflicts: channels/drdynvc/client/drdynvc_main.c channels/rdpgfx/client/rdpgfx_main.c client/X11/xf_gfx.c		2015-08-25 00:07:04 -07:00
..
client	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-08-25 00:07:04 -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