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
..
2014-09-09 16:33:05 +02:00
2014-09-09 16:32:22 +02:00
2014-09-09 16:32:22 +02:00
2014-07-25 11:31:50 +02:00
2014-08-15 14:15:53 -04:00
2014-07-28 16:47:42 -04:00
2014-09-09 16:33:05 +02:00
2014-08-15 18:12:53 -04:00
2014-09-09 16:33:05 +02:00
2014-09-09 16:33:05 +02:00
2014-07-24 16:34:59 +02:00