Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 7 Mar 2016 15:19:50 +0000 (10:19 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 7 Mar 2016 15:19:50 +0000 (10:19 -0500)
commitceefc4b099b1b375b88aa4e001bf5c8195ad0742
tree0ab553883a7de5da57f40ecce2ba178992d4f241
parent8fa25aae6a714d29b367d22ed48b43337783fc5c
parent9f8baf38d0f3c9fdf2d414032fba864665370e9a
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt
channels/audin/client/mac/audin_mac.c
channels/rdpsnd/client/mac/rdpsnd_mac.c
winpr/include/winpr/nt.h
winpr/include/winpr/string.h
winpr/include/winpr/user.h
winpr/libwinpr/crt/string.c
winpr/libwinpr/crt/unicode.c
winpr/libwinpr/crypto/cipher.c
winpr/libwinpr/file/file.c