projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d102e74 3ddbb12)
Merge branch 'shadow' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 19 Sep 2014 18:39:43 +0000 (14:39 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 19 Sep 2014 18:39:43 +0000 (14:39 -0400)
Conflicts:
libfreerdp/core/capabilities.c

1  2 
libfreerdp/core/capabilities.c patch | diff1 | diff2 | blob | history

diff --cc libfreerdp/core/capabilities.c
Simple merge
Domain: Graphics System / Display Server;