projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2405a2 ae9c10e)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 21:34:34 +0000 (16:34 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 21:34:34 +0000 (16:34 -0500)
1  2 
client/X11/xf_client.c patch | diff1 | diff2 | blob | history
include/freerdp/freerdp.h patch | diff1 | diff2 | blob | history
libfreerdp/core/freerdp.c patch | diff1 | diff2 | blob | history
libfreerdp/core/tcp.c patch | diff1 | diff2 | blob | history

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