projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e424653 856880b)
Merge branch 'master' of github.com:awakecoding/FreeRDP into lync
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jun 2014 21:22:50 +0000 (17:22 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 30 Jun 2014 21:22:50 +0000 (17:22 -0400)

Trivial merge
Domain: Graphics System / Display Server;