projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4c809c 915b9a1)
Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 17:13:02 +0000 (13:13 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 May 2016 17:13:02 +0000 (13:13 -0400)

Trivial merge
Domain: Graphics System / Display Server;