projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 162411d 4fb0ad0)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 4 Aug 2015 15:55:38 +0000 (11:55 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 4 Aug 2015 15:55:38 +0000 (11:55 -0400)

Trivial merge
Domain: Graphics System / Display Server;