projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f17a36f b1bcbea)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:59:41 +0000 (12:59 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:59:41 +0000 (12:59 -0500)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
libfreerdp/core/transport.c patch | diff1 | diff2 | blob | history

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