FreeRDP/channels/drdynvc
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
server misc fixes: 2015-07-30 06:49:21 -07:00
ChannelOptions.cmake channels: rdpsnd refactoring, drdynvc initial server-side code 2013-08-18 21:52:55 -04:00
CMakeLists.txt channels: rdpsnd refactoring, drdynvc initial server-side code 2013-08-18 21:52:55 -04:00