Fixed typo
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP
android: updated toolchain file

* support for ndk version r8d+
* improved x86_64 host machine support
* support non-release NDK layouts
Merge pull request #1406 from bmiklautz/android_toolchain

android: updated toolchain file
Fixes libwinpr build issue on Windows

Adds conditional statements in file.c to solve a Posix portability
issue on Windows introduced with the following commit:

913d532e0d3456945236567af00e8119564307ff
Merge pull request #1409 from alexpilotti/master

Fixes libwinpr build issue on Windows
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP
codec/rfx: fix multithreaded encoder

Some component of the encoder chain (I suspect the rlgr encoder) expects
the output buffer to be zeroed. The multithreaded RemoteFX encoder uses
wStreams from the StreamPool which are reused and not zeroed out of
course. For now, in order to prevent data corruption we clear the stream.
Merge pull request #1413 from nfedera/fix-2013-08-10-01

codec/rfx: fix multithreaded encoder
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP