new file:   winpr/include/winpr/wtsapi.h
	new file:   winpr/libwinpr/wtsapi/CMakeLists.txt
	new file:   winpr/libwinpr/wtsapi/ModuleOptions.cmake
	new file:   winpr/libwinpr/wtsapi/wtsapi.c
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  channels/rdpei: fix multitouch with Word 2013
  libfreerdp-client: use PubSub for OnChannelConnected/OnChannelDisconnected
  channels/disp: update
  client: add option for MS-RDPEDISP (/disp)
  channels/disp: initial RDP8.1 MS-RDPEDISP implementation
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Norbert Federa (3) and others
# Via Bernhard Miklautz (4) and Marc-André Moreau (4)
* 'master' of git://github.com/awakecoding/FreeRDP:
  freerdp: merge with master
  channels/disp: initial MS-RDPEDISP support (8.1 Preview build)
  libfreerdp-gdi: added gdi_surface_frame_marker
  Fix for Issue #1349
  codec/rfx: use function pointer for rlgr codec
  fixed error on compilation WITH_DEBUG_RDP ON that was raising due to wrong variable in debug statement
  codec/rfx: Fixed bufferpool size used for RemoteFX
Custom cursor now visible on mac version. Cursor is now associated with NSView for automatic tracking area handling.
Makefile: updated post-build  NIB file generation events to apply to all generators for Mac Client.
MacFreeRDP: cleanup
libfreerdp-core: initialize queue objects earlier
MacFreeRDP: async rdpStart.

Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: initialize queue objects earlier
  mfreerdp: fix cursor rendering

Conflicts:
	client/Mac/MRDPView.m
MacFreeRDP: non-blocking connect
libfreerdp-core: split licensing/capability steps in server-side RDP state machine
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: split licensing/capability steps in server-side RDP state machine
libfreerdp-core: expand comments for connection sequence, split in more steps server-side connection code
MacFreeRDP: connection now starts asynchronously.
Replaced RunLoop implementation with standard pthreads.
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: expand comments for connection sequence, split in more steps server-side connection code
libfreerdp-core: wrap state transition actions
Fixed deadlock when closing session window.
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: wrap state transition actions
FreeRDP client: turned on setting to only write modified values to RDP file.
- MRDPView: rdpConnectError moved outside of the Framework, to the native App (in AppDelegate) This is now handled on the client side.
- freerdp_connect: all code paths now trigger a ConnectionResult event.
libfreerdp-core: modify server-side confirm active pdu receiving logic
libfreerdp-core: improvements to the server-side activation/reactivation code