Merge remote-tracking branch 'upstream/master' into SIMDFastAreaResize-2
removed debug messages
changed loop condition
added #undef _mm_packus_epi32
replaced DeviceInfo().supports with deviceSupports
Merge pull request #229 from Nerei:master
fixed printCudaDeviceInfo for 3.5 CC (Patch #2641)
fixed printShortCudaDeviceInfo for new CC
Merge pull request #220 from ilya-lavrenov:SIMDFastAreaResize
call resetDevice if gpu test fails
fixed warnings under windows
probably fixed build problems on Android
Revert "call resetDevice if gpu test fails"

This reverts commit ab25fe9e377fdbd69c916d5124483fa26e4a7835.
update documentation to latest connected components interface
added GPU_TEST_P macros
added cv::gpu::resetDevice to RunPerfTestBody
Revert "disabled video decoding under linux"

This reverts commit 889674ef43fb8d2a35883ae31895b34a58089007.
fixed build for CARMA:

* added CMake toolchain file
* added WITH_NVCUVID flag
Increase max RMSE error for tvl1 optical flow test
Merge branch 2.4