Merge branch 'master' of github.com:FreeRDP/FreeRDP into shadow
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 26 Jul 2014 18:42:07 +0000 (14:42 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 26 Jul 2014 18:42:07 +0000 (14:42 -0400)
commit783ec8b9fcb8a90bb42fd23de1fa378def299ad0
treec5dd5bd17fd1d35d694f5f550e2bb05fc5b2d45a
parent9e6fa5f5a56c1c40ca397eddd3fea0ebf4921469
parent6812383d05dad7a6eb2ea4ce9ef11a63a2143e0b
Merge branch 'master' of github.com:FreeRDP/FreeRDP into shadow
include/freerdp/settings.h
libfreerdp/core/settings.c
libfreerdp/crypto/tls.c