projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b7b6ca e039f82)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 20:30:17 +0000 (16:30 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 20:30:17 +0000 (16:30 -0400)

Trivial merge
Domain: Graphics System / Display Server;