projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d665b1 ef4fc32)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 18 Mar 2012 17:13:48 +0000 (13:13 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 18 Mar 2012 17:13:48 +0000 (13:13 -0400)

Trivial merge
Domain: Graphics System / Display Server;