projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e17711 ca90650)
Merge branch 'shadow' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 21:06:13 +0000 (17:06 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 21:06:13 +0000 (17:06 -0400)
1  2 
client/X11/xf_client.c patch | diff1 | diff2 | blob | history
client/common/cmdline.c patch | diff1 | diff2 | blob | history

diff --cc client/X11/xf_client.c
Simple merge
diff --cc client/common/cmdline.c
Simple merge
Domain: Graphics System / Display Server;