projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0818846 f9097d4)
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 25 Nov 2014 16:20:07 +0000 (11:20 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 25 Nov 2014 16:20:07 +0000 (11:20 -0500)
1  2 
libfreerdp/core/peer.c patch | diff1 | diff2 | blob | history

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