projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e57706 f86f5bc)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Feb 2015 14:51:11 +0000 (09:51 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Feb 2015 14:51:11 +0000 (09:51 -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;