Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 15 Nov 2014 17:37:29 +0000 (12:37 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 15 Nov 2014 17:37:29 +0000 (12:37 -0500)
commit496ce106376f2ef8357d284417eacf5e6184eba7
treebb5a9b9e32134b0e4dd3b39253ff1ce4fe9e4323
parent1c9231acf8e3952f6d8d3f0c4234a78c8015d4d7
parent361dce676e3251f4c2e7bd7b39f06370f89d0073
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt