Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp

2014-01-14 11:53:59 +04:00

..

ocl

added NORM_L2SQR type to cv::norm

2014-01-10 18:45:52 +04:00

test_arithm.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-14 11:53:59 +04:00

test_countnonzero.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

test_ds.cpp

Boring changes - core.

2013-09-05 18:26:43 +04:00

test_dxt.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_eigen.cpp

Cleanup core module API

2013-04-09 13:36:32 +04:00

test_io.cpp

Boring changes - core.

2013-09-05 18:26:43 +04:00

test_main.cpp

C4447 warning about main function format suppressed.

2013-08-21 07:24:46 -07:00

test_mat.cpp

Boring changes - core.

2013-09-05 18:26:43 +04:00

test_math.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_misc.cpp

added new perf tests to core

2013-12-27 20:02:12 +04:00

test_operations.cpp

Changed / for Matx to Matx::div, for symmetry with Matx::mul.

2013-07-16 12:25:26 +04:00

test_precomp.hpp

Move FileStorage to separate header

2013-04-01 19:18:05 +04:00

test_ptr.cpp

Added tests for Ptr.

2013-09-05 19:03:00 +04:00

test_rand.cpp

Backported RNG_MT19937 from master.

2013-04-10 19:39:38 +04:00

test_umat.cpp

implemented UMat::convertTo

2013-12-15 14:15:30 +04:00