projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebaa96a 0ed9936)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Dec 2013 16:54:03 +0000 (11:54 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Dec 2013 16:54:03 +0000 (11:54 -0500)
1  2 
libfreerdp/crypto/tls.c patch | diff1 | diff2 | blob | history
winpr/libwinpr/environment/environment.c patch | diff1 | diff2 | blob | history
winpr/libwinpr/sysinfo/sysinfo.c patch | diff1 | diff2 | blob | history

diff --cc libfreerdp/crypto/tls.c
Simple merge
diff --cc winpr/libwinpr/sysinfo/sysinfo.c
Simple merge
Domain: Graphics System / Display Server;