projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e1cdf1 951368a)
Merge branch 'master' of github.com:awakecoding/FreeRDP into channels
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 27 Feb 2014 20:09:06 +0000 (15:09 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 27 Feb 2014 20:09:06 +0000 (15:09 -0500)
1  2 
channels/rdpdr/client/rdpdr_main.c patch | diff1 | diff2 | blob | history
channels/rdpdr/client/rdpdr_main.h patch | diff1 | diff2 | blob | history
channels/rdpsnd/server/rdpsnd_main.c patch | diff1 | diff2 | blob | history

diff --cc channels/rdpdr/client/rdpdr_main.c
Simple merge
diff --cc channels/rdpdr/client/rdpdr_main.h
Simple merge
diff --cc channels/rdpsnd/server/rdpsnd_main.c
Simple merge
Domain: Graphics System / Display Server;