Merge remote-tracking branch 'upstream/master'
authorC-o-r-E <can.of.tuna@gmail.com>
Thu, 31 Jan 2013 00:05:35 +0000 (19:05 -0500)
committerC-o-r-E <can.of.tuna@gmail.com>
Thu, 31 Jan 2013 00:05:35 +0000 (19:05 -0500)
commita39ef9980f64adbf981b18fa3bf0e878a6373782
treeb97e7c697b1aeb92e9a7e449b945dcccc9c9c779
parent0aeeb1cf9a574a17bd21af244272373f0a1e7985
parent9f8d79c72acb40c841baadd1925a889f48ce6702
Merge remote-tracking branch 'upstream/master'
CMakeLists.txt
libfreerdp/codec/rfx.c