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

..

cache

…

codec

Merge branch 'fix_2036' of git://github.com/akallabeth/FreeRDP into akallabeth-fix_2036

2014-09-11 13:03:01 +02:00

common

…

core

Merge branch 'fix_2036' of git://github.com/akallabeth/FreeRDP into akallabeth-fix_2036

2014-09-11 13:03:01 +02:00

crypto

…

gdi

…

locale

…

primitives

Merge branch 'fix_2036' of git://github.com/akallabeth/FreeRDP into akallabeth-fix_2036

2014-09-11 13:03:01 +02:00

rail

…

utils

…

CMakeLists.txt

…

dummy.c

…