Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:59:41 +0000 (12:59 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:59:41 +0000 (12:59 -0500)
commitb0b8b6aa9e5dd10389cb5557c6ba32760b7c5b8c
tree354e9b55727c5a2d294c9bcea3b6fcae55c420c7
parentf17a36f84cced265ea9d30e464e0ddb78c014448
parentb1bcbea4833817900a786d6460b752e26a1880f8
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt
libfreerdp/core/transport.c