Marc-André Moreau 422336b8b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: include/freerdp/channels/log.h		2014-08-11 18:56:07 -04:00
..
audin.h
channels.h
cliprdr.h
encomsp.h	channels/encomsp: initial client-side implementation	2014-06-23 18:17:26 -04:00
log.h	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-11 18:56:07 -04:00
rail.h
rdpdr.h	winpr: improve windows builds across visual studio versions and toolsets	2014-07-17 15:11:04 -04:00
rdpgfx.h	channels/rdpgfx: parse H264 bitmap stream and meta block	2014-07-08 17:37:29 -04:00
rdpsnd.h
remdesk.h	channels/remdesk: initial working Remote Assistance	2014-06-30 13:26:11 -04:00
tsmf.h
wtsvc.h	Fix conflicting define	2014-06-25 17:35:20 +02:00