projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cf0dc1 3b71138)
Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Jan 2013 21:42:59 +0000 (16:42 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Jan 2013 21:42:59 +0000 (16:42 -0500)

Trivial merge
Domain: Graphics System / Display Server;