Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ... Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVLegacyOptions.cmake modules/contrib/src/retina.cpp modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/video.rst modules/gpu/src/speckle_filtering.cpp modules/python/src2/cv2.cv.hpp modules/python/test/test2.py samples/python/watershed.py		2013-08-27 13:26:44 +04:00
..
perf_abs.cpp
perf_addWeighted.cpp
perf_arithm.cpp
perf_bitwise.cpp
perf_compare.cpp
perf_convertTo.cpp
perf_dft.cpp
perf_dot.cpp
perf_inRange.cpp
perf_main.cpp
perf_mat.cpp
perf_math.cpp
perf_merge.cpp
perf_minmaxloc.cpp
perf_norm.cpp
perf_precomp.hpp
perf_reduce.cpp
perf_split.cpp
perf_stat.cpp