projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fff2cb df0d258)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Feb 2013 16:00:00 +0000 (11:00 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 8 Feb 2013 16:00:00 +0000 (11:00 -0500)

Trivial merge
Domain: Graphics System / Display Server;