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

..

ann_mlp.cpp

fix for Bug #3085:

2013-06-13 10:22:56 +04:00

boost.cpp

fixed cpp wrappers of ML tree-based models

2013-08-23 18:13:10 +04:00

cnn.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

data.cpp

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

2013-11-26 15:05:26 +04:00

em.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

ertrees.cpp

Merge pull request #1348 from SpecLad:merge-2.4

2013-08-28 13:41:41 +04:00

estimate.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

gbt.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

inner_functions.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

knearest.cpp

Normalized file endings.

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

ml_init.cpp

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

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

nbayes.cpp

Fix a memory leak in CvNormalBayesClassifier::train()

2013-09-20 22:36:49 +02:00

precomp.hpp

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

rtrees.cpp

Boring changes - ml.

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

svm.cpp

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

2013-10-15 20:08:52 +04:00

testset.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

tree.cpp

Boring changes - ml.

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