projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 610af77 7ef2ba8)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into channels
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 2 Oct 2012 15:02:09 +0000 (11:02 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 2 Oct 2012 15:02:09 +0000 (11:02 -0400)

Trivial merge
Domain: Graphics System / Display Server;