projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4df990 d76654b)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into cleanup
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 22 Aug 2012 16:46:12 +0000 (12:46 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 22 Aug 2012 16:46:12 +0000 (12:46 -0400)

Trivial merge
Domain: Graphics System / Display Server;