e4a4aa4d3a
Conflicts: channels/encomsp/client/encomsp_main.c libfreerdp/core/tcp.c libfreerdp/crypto/certificate.c server/Windows/CMakeLists.txt server/X11/xf_cursor.c server/X11/xf_input.c server/X11/xf_interface.c server/X11/xf_monitors.c server/X11/xf_peer.c |
||
---|---|---|
.. | ||
audin.h | ||
channels.h | ||
cliprdr.h | ||
encomsp.h | ||
log.h | ||
rail.h | ||
rdpdr.h | ||
rdpgfx.h | ||
rdpsnd.h | ||
remdesk.h | ||
tsmf.h | ||
wtsvc.h |