projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca8b92a 9e4d766)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 2 Feb 2012 02:37:11 +0000 (21:37 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 2 Feb 2012 02:37:11 +0000 (21:37 -0500)

Trivial merge
Domain: Graphics System / Display Server;