projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c59ae16 9a8b837)
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Mon, 28 Apr 2014 14:11:25 +0000 (10:11 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Mon, 28 Apr 2014 14:11:25 +0000 (10:11 -0400)
1  2 
client/common/file.c patch | diff1 | diff2 | blob | history

diff --cc client/common/file.c
Simple merge
Domain: Graphics System / Display Server;