projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e6a5d6 cdc3235)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 10 Dec 2011 15:54:18 +0000 (10:54 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 10 Dec 2011 15:54:18 +0000 (10:54 -0500)

Trivial merge
Domain: Graphics System / Display Server;