Martin Fleisz 54b96290c9 Merge branch 'fix_2036' of git://github.com/akallabeth/FreeRDP into akallabeth-fix_2036 ... Conflicts: libfreerdp/codec/test/TestFreeRDPCodecPlanar.c libfreerdp/codec/test/TestFreeRDPCodecProgressive.c libfreerdp/core/transport.c libfreerdp/primitives/test/TestPrimitivesYCbCr.c		2014-09-11 13:03:01 +02:00
..
freerdp	Merge branch 'fix_2036' of git://github.com/akallabeth/FreeRDP into akallabeth-fix_2036	2014-09-11 13:03:01 +02:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00