projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 247beff ad4d8d2)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 17:59:25 +0000 (13:59 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 17:59:25 +0000 (13:59 -0400)

Trivial merge
Domain: Graphics System / Display Server;