projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb8f34f 3d75db0)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 8 Jan 2014 16:16:35 +0000 (11:16 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 8 Jan 2014 16:16:35 +0000 (11:16 -0500)
1  2 
libfreerdp/core/capabilities.c patch | diff1 | diff2 | blob | history

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