Merged pull requests: #890 An error occurred from caorong:patch-1 #893 An error occurred from jet47:gpu-arm-fixes #933 An error occurred from pengx17:2.4_macfix_cont #935 An error occurred from pengx17:2.4_filter2d_fix #936 An error occurred from bitwangyaoyao:2.4_perf #937 An error occurred from bitwangyaoyao:2.4_fixPyrLK #938 An error occurred from pengx17:2.4_surf_sample #939 An error occurred from pengx17:2.4_getDevice #940 An error occurred from SpecLad:autolock #941 An error occurred from apavlenko:signed_char #946 An error occurred from bitwangyaoyao:2.4_samples2 #947 An error occurred from jet47:fix-gpu-arm-build #948 An error occurred from jet47:cuda-5.5-support #952 An error occurred from SpecLad:jepg #953 An error occurred from jet47:fix-bug-3069 #955 An error occurred from SpecLad:symlink #957 An error occurred from pengx17:2.4_fix_corner_detector #959 An error occurred from SpecLad:qt4-build #960 An error occurred from SpecLad:extra-modules Conflicts: modules/core/include/opencv2/core/core.hpp modules/gpu/CMakeLists.txt modules/gpu/include/opencv2/gpu/device/vec_math.hpp modules/gpu/perf/perf_video.cpp modules/gpuimgproc/src/cuda/hough.cu modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/pyrlk.cpp samples/gpu/driver_api_multi.cpp samples/gpu/driver_api_stereo_multi.cpp samples/ocl/surf_matcher.cpp
An error occurred