Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding
authorMike McDonald <Mike.McDonald@software.dell.com>
Fri, 1 Aug 2014 19:49:19 +0000 (15:49 -0400)
committerMike McDonald <Mike.McDonald@software.dell.com>
Fri, 1 Aug 2014 19:49:19 +0000 (15:49 -0400)
1  2 
winpr/libwinpr/synch/wait.c

Simple merge