projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0e09e6 78423cb)
Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:02:36 +0000 (17:02 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Sep 2013 21:02:36 +0000 (17:02 -0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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