Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 15:05:17 +0000 (11:05 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 15:05:17 +0000 (11:05 -0400)
commit915b9a15b14d4241e8b98501308eb3924fe262f0
tree74b917ac93524a323d577e441cfae3a2ed09a520
parenta192967a5bdac3b6c84276f07ed418a53fe23bae
parentc5940d890335ccbc11901dde4bff84a1acfd0568
Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
winpr/libwinpr/bcrypt/CMakeLists.txt
CMakeLists.txt
channels/drive/client/drive_file.c
channels/rdpdr/client/rdpdr_main.c
client/Mac/MRDPView.m
cmake/ConfigOptions.cmake
libfreerdp/codec/color.c
libfreerdp/codec/h264.c
winpr/include/winpr/nt.h