projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22ac469 23b7d3b)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Feb 2015 15:05:33 +0000 (10:05 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Feb 2015 15:05:33 +0000 (10:05 -0500)

Trivial merge
Domain: Graphics System / Display Server;