projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8999bd8 a40a971)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 13 Oct 2011 19:51:20 +0000 (15:51 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 13 Oct 2011 19:51:20 +0000 (15:51 -0400)
1  2 
client/X11/xf_gdi.c patch | diff1 | diff2 | blob | history
libfreerdp-core/orders.c patch | diff1 | diff2 | blob | history

diff --cc client/X11/xf_gdi.c
Simple merge
diff --cc libfreerdp-core/orders.c
Simple merge
Domain: Graphics System / Display Server;