projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5530bfb 073c6fb)
Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 18 Apr 2013 18:37:00 +0000 (11:37 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 18 Apr 2013 18:37:00 +0000 (11:37 -0700)

Trivial merge
Domain: Graphics System / Display Server;