projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01c557d 4d3ea77)
Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 11 Jul 2014 20:58:24 +0000 (16:58 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 11 Jul 2014 20:58:24 +0000 (16:58 -0400)
Conflicts:
server/X11/CMakeLists.txt


Trivial merge
Domain: Graphics System / Display Server;