projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef71181 86ab147)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 29 Jan 2015 19:51:40 +0000 (14:51 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 29 Jan 2015 19:51:40 +0000 (14:51 -0500)

Trivial merge
Domain: Graphics System / Display Server;