Added new advanced configuration options for async.
Implemented async_channels, async_transport and async_update.
Implemented async_input handling.
Added new advanced configuration options for async.
Implemented async_channels, async_transport and async_update.
Implemented async_input handling.
Merge branch 'android_async' of github.com:akallabeth/FreeRDP into android_async

Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/jni/android_freerdp.c
Added missing assert.
Merge remote-tracking branch 'upstream/master' into android_async
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async

Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java
Moved async settings to debug menu.
Fixed classpath settings for aFreeRDP project.
Fixed typo.
Fixed XML menu configuration.
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async
windows build: ignore generated files (nmake)
windows build: use different .def file for xp

Use different def file for windows < 5.1.
Gateway: Parsing fix for Create Tunnel Response

This fix addresses a logon issue that may occur when a logon
message is present.
Gateway: Logoff crash fix

This addresses a race condition where the freerdp client
may crash on logoff.
Merge pull request #1550 from dbungert/gateway

Gateway: 2 Fixes
Merge pull request #1537 from bmiklautz/windowsbuild

Windows build fixes
Merge pull request #1533 from akallabeth/android_async

Android async