projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64915c9 e965351)
Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 24 Apr 2014 01:31:26 +0000 (21:31 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 24 Apr 2014 01:31:26 +0000 (21:31 -0400)

Trivial merge
Domain: Graphics System / Display Server;