projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1322c7 1d93dba)
Merge branch 'winpr' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 23:31:26 +0000 (19:31 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 23:31:26 +0000 (19:31 -0400)

Trivial merge
Domain: Graphics System / Display Server;