projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fc0f72 9fcf5ea)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 14:38:29 +0000 (09:38 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 14:38:29 +0000 (09:38 -0500)

Trivial merge
Domain: Graphics System / Display Server;