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

Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp

2014-02-17 15:24:05 +04:00

..

adaptiveskindetector.cpp

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

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

ba.cpp

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

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

bowmsctrainer.cpp

Merge commit '43aec5ad' into merge-2.4

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

chamfermatching.cpp

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

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

chowliutree.cpp

Merge commit '43aec5ad' into merge-2.4

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

colormap.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +04:00

colortracker.cpp

Merge commit '43aec5ad' into merge-2.4

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

contrib_init.cpp

Normalized file endings.

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

detection_based_tracker.cpp

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

2013-11-11 16:55:36 +04:00

facerec.cpp

Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer

2014-01-30 21:53:05 +00:00

featuretracker.cpp

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

2013-10-22 14:28:00 +04:00

fuzzymeanshifttracker.cpp

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

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

gencolors.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +04:00

hybridtracker.cpp

Merge commit '43aec5ad' into merge-2.4

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

inputoutput.cpp

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

2013-08-27 19:15:47 +04:00

lda.cpp

Merge commit '43aec5ad' into merge-2.4

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

logpolar_bsm.cpp

Merge commit '43aec5ad' into merge-2.4

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

octree.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +04:00

openfabmap.cpp

Remove all using directives for STL namespace and members

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

polyfit.cpp

this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy

2013-09-30 16:00:39 +04:00

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

2013-07-10 16:02:07 +04:00

rgbdodometry.cpp

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

2014-02-17 15:24:05 +04:00

selfsimilarity.cpp

Remove all using directives for STL namespace and members

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

spinimages.cpp

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

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

stereovar.cpp

Merge commit '43aec5ad' into merge-2.4

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