
Conflicts: client/Windows/wf_cliprdr.h client/Windows/wf_event.h client/X11/xf_client.c client/X11/xf_gdi.c libfreerdp/gdi/gdi.c server/Mac/mf_input.c
Conflicts: client/Windows/wf_cliprdr.h client/Windows/wf_event.h client/X11/xf_client.c client/X11/xf_gdi.c libfreerdp/gdi/gdi.c server/Mac/mf_input.c