projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e94ac6 144d0d9)
Merge branch 'gateway' of https://github.com/dvincent-devolutions/FreeRDP into gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 17 Mar 2015 18:54:04 +0000 (14:54 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 17 Mar 2015 18:54:04 +0000 (14:54 -0400)
1  2 
libfreerdp/core/gateway/http.c patch | diff1 | diff2 | blob | history
libfreerdp/core/transport.c patch | diff1 | diff2 | blob | history

diff --cc libfreerdp/core/gateway/http.c
Simple merge
diff --cc libfreerdp/core/transport.c
Simple merge
Domain: Graphics System / Display Server;