projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b04d60 4ba48f4)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 29 Feb 2012 07:26:36 +0000 (02:26 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 29 Feb 2012 07:26:36 +0000 (02:26 -0500)

Trivial merge
Domain: Graphics System / Display Server;