projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a011fe 99b9a62)
Merge branch 'master' of github.com:FreeRDP/FreeRDP into cleanup
authorMarc-Andre <awake@freedom.(none)>
Mon, 17 Sep 2012 19:27:49 +0000 (15:27 -0400)
committerMarc-Andre <awake@freedom.(none)>
Mon, 17 Sep 2012 19:27:49 +0000 (15:27 -0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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