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)
commitfa64ca758d6ff05aec78a6cbb118b5ad6dc2101a
tree4fbbe3b8a2da34756197e3494f0520014edc77c6
parenta6af3f5c0a1beefa6a11b1b45abadb3adbcc2c9d
parentc0b481252547e7fb15381fbe13a66d5ea0095c16
Merge branch 'master' of github.com:FreeRDP/FreeRDP
CMakeLists.txt