Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 2 Jun 2015 13:17:30 +0000 (09:17 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 2 Jun 2015 13:17:30 +0000 (09:17 -0400)
commit36b7d9c4e599835f50af180bcbcce8a757e30c98
treecdf740126b1d070add63c8d1dc2c933c3f9ad6f6
parent4886c4c9b19c1a84f582cedf9801f6dc57166cd7
parent608174cba6e370b39af7f1fad9b33d8236f1fff0
Merge branch 'master' of github.com:FreeRDP/FreeRDP
winpr/libwinpr/winsock/winsock.c