projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf5cee3 e1c10d2)
mfreerdp-server: merged wf_peer.c
authorC-o-r-E <can.of.tuna@gmail.com>
Wed, 14 Nov 2012 16:05:07 +0000 (11:05 -0500)
committerC-o-r-E <can.of.tuna@gmail.com>
Wed, 14 Nov 2012 16:05:07 +0000 (11:05 -0500)
1  2 
server/Windows/wf_peer.c patch | diff1 | diff2 | blob | history
server/Windows/wf_update.c patch | diff1 | diff2 | blob | history

diff --cc server/Windows/wf_peer.c
Simple merge
diff --cc server/Windows/wf_update.c
Simple merge
Domain: Graphics System / Display Server;