Merge github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 17 Nov 2012 21:46:53 +0000 (16:46 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 17 Nov 2012 21:46:53 +0000 (16:46 -0500)
1  2 
CMakeLists.txt
config.h.in

diff --cc CMakeLists.txt
Simple merge
diff --cc config.h.in
Simple merge