opencv

History

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

Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in

2014-01-20 15:10:19 +04:00

doc

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

2013-12-23 18:50:17 +04:00

include/opencv2

Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:30 +04:00

perf

added NORM_L2SQR type to cv::norm

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

src

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