projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e6fa5f 6812383)
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)
1  2 
include/freerdp/settings.h patch | diff1 | diff2 | blob | history
libfreerdp/core/settings.c patch | diff1 | diff2 | blob | history
libfreerdp/crypto/tls.c patch | diff1 | diff2 | blob | history

diff --cc include/freerdp/settings.h
Simple merge
diff --cc libfreerdp/core/settings.c
Simple merge
diff --cc libfreerdp/crypto/tls.c
Simple merge
Domain: Graphics System / Display Server;