projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 168d46f 82a5305)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 20:23:45 +0000 (16:23 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 20:23:45 +0000 (16:23 -0400)

Trivial merge
Domain: Graphics System / Display Server;