projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7324ded 368486d)
Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Apr 2014 00:06:12 +0000 (20:06 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Apr 2014 00:06:12 +0000 (20:06 -0400)

Trivial merge
Domain: Graphics System / Display Server;