projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72d2c7c 3959f0d)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 21 Jun 2012 18:30:35 +0000 (14:30 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 21 Jun 2012 18:30:35 +0000 (14:30 -0400)

Trivial merge
Domain: Graphics System / Display Server;