Marc-André Moreau aca0b9996d Merge branch 'remoteFx_fix2' of https://github.com/hardening/FreeRDP into hardening-remoteFx_fix2 ... Conflicts: libfreerdp/codec/test/CMakeLists.txt		2014-02-15 11:06:09 -05:00
..
freerdp	Merge branch 'remoteFx_fix2' of https://github.com/hardening/FreeRDP into hardening-remoteFx_fix2	2014-02-15 11:06:09 -05:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00