projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d56e26 65214b4)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Dec 2014 20:55:51 +0000 (15:55 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Dec 2014 20:55:51 +0000 (15:55 -0500)
Conflicts:
client/X11/xf_client.c

1  2 
client/X11/xf_client.c patch | diff1 | diff2 | blob | history

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