projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de81c3 dbcc972)
Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 5 May 2015 18:25:55 +0000 (14:25 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 5 May 2015 18:25:55 +0000 (14:25 -0400)

Trivial merge
Domain: Graphics System / Display Server;