Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
commitae6f331570c82b0504d709602cda06f3bc549f89
tree35719e122f210129422b693a0164e552df541017
parent337bcf76059fe9b03f6fd28c00eb304b5cdc9bee
parent519f71c828bd31cac5f3c26a6c0841ce52839eb2
Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr
libfreerdp-codec/color.c
libfreerdp-utils/CMakeLists.txt
libfreerdp-utils/dsp.c