projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4987f2b 75b919a)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Nov 2013 17:31:43 +0000 (12:31 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Nov 2013 17:31:43 +0000 (12:31 -0500)

Trivial merge
Domain: Graphics System / Display Server;