projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ba99a5 c1fb9ff)
Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Jul 2011 04:37:38 +0000 (00:37 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Jul 2011 04:37:38 +0000 (00:37 -0400)

Trivial merge
Domain: Graphics System / Display Server;