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
..
CMakeLists.txt	channels: fix drdynvc, patch memory leaks	2014-12-27 15:20:29 -05:00
drdynvc_main.c	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-08-25 00:07:04 -07:00
drdynvc_main.h	introduced channel error reporting system	2015-07-15 00:50:35 -07:00