projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d61c2d4 ceefc4b)
Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Mar 2016 02:21:17 +0000 (21:21 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 8 Mar 2016 02:21:17 +0000 (21:21 -0500)

Trivial merge
Domain: Graphics System / Display Server;