projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17834af 4d77f2a)
Merge pull request #2765 from akallabeth/connect_abort
authorMartinHaimberger <martin.haimberger@gmail.com>
Mon, 7 Sep 2015 08:05:24 +0000 (10:05 +0200)
committerMartinHaimberger <martin.haimberger@gmail.com>
Mon, 7 Sep 2015 08:05:24 +0000 (10:05 +0200)
Connect abort and unified TCP connect

1  2 
include/freerdp/freerdp.h patch | diff1 | diff2 | blob | history
libfreerdp/core/freerdp.c patch | diff1 | diff2 | blob | history

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