projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6af3f5 c0b4812)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 15:50:30 +0000 (10:50 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 15:50:30 +0000 (10:50 -0500)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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