projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f79deaf 1d8d363)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 14 Jan 2015 16:24:13 +0000 (11:24 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 14 Jan 2015 16:24:13 +0000 (11:24 -0500)

Trivial merge
Domain: Graphics System / Display Server;