Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename ...

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

2013-09-06 15:44:44 +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

missing fclose when returning early

2013-07-24 23:53:18 +10: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 branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

nbayes.cpp

Normalized file endings.

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

precomp.hpp

Merge remote-tracking branch 'origin/2.4'

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

rtrees.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

svm.cpp

Merge commit '43aec5ad' into merge-2.4

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

testset.cpp

Set stricter warning rules for gcc

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

tree.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00