Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Feb 2016 16:39:45 +0000 (11:39 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Feb 2016 16:39:45 +0000 (11:39 -0500)
commitbfca674f2d47d598d2c3335b0bffe218214dc029
treeca44748b3643d91247d08e356e32fd3427b00f1f
parent8cc799f59944d424ee730cb38530f81d0f53fff5
parent7534876209b49239909828e289de6664a668428b
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt
client/Mac/MRDPView.m
client/Mac/cli/AppDelegate.m
winpr/libwinpr/file/file.c
winpr/libwinpr/utils/debug.c