projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 374b5e4 8040c58)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 26 Mar 2014 13:01:39 +0000 (09:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 26 Mar 2014 13:01:39 +0000 (09:01 -0400)

Trivial merge
Domain: Graphics System / Display Server;