Merge branch 'master' into master
authorNorbert Federa <nfedera@users.noreply.github.com>
Mon, 19 Dec 2016 07:50:16 +0000 (08:50 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Dec 2016 07:50:16 +0000 (08:50 +0100)
commitcc814ec05619a03065fda94592e18077f61eef36
tree5ca65b47f23d6669556804c007b318aeba9fa114
parent831c3fb37423e89d8246352860e0867d7c4b6f63
parent80bf3d6ae58ce1ecec2b8c1996d2183e588a30a5
Merge branch 'master' into master
winpr/include/winpr/wtypes.h.in