# By Bernhard Miklautz (14) and others
# Via Marc-André Moreau (10) and others
* 'master' of git://github.com/awakecoding/FreeRDP: (40 commits)
xfreerdp: improve selection between multitouch and non-multitouch devices with XInput 2
cache and core: set pointer to NULL after free
pointer cache: fixed double free
freerdp-client: use 32bpp with NSCodec
libwinpr-utils: fix deadlock in PubSub
utils/profiler: fix unix build
utils: fix broken stopwatch implementation
Android: various bug fixes to prevent NullPointerExceptions
client/x11: fixed incorrect size calculation
libfreerdp-utils/pcap: open pcap in binary mode
libwinpr-synch: fix broken USleep (on WIN32)
sample server: support build on win32
server/sample: fix for issue #1312 (mstsc protocol error)
fixed incorrect size calculation
libfreerdp-common: add some null pointer checks.
libfreerdp-codec/rfx: fix a memory leak.
winpr/alignment: use size_t instead of UINT32
Assorted tsmf and gstreamer fixes:
winpr: offset support in _aligned_offset_malloc
xfreerdp-server: removed binary
...
13a9de2b7a