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

Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp

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

..

adaptiveskindetector.cpp

Merge commit '43aec5ad' into merge-2.4

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

ba.cpp

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

2013-07-22 18:38:57 +04:00

bowmsctrainer.cpp

Merge commit '43aec5ad' into merge-2.4

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

chamfermatching.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +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 commit '43aec5ad' into merge-2.4

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

facerec.cpp

Deleted all trailing whitespace.

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

featuretracker.cpp

Merge commit '43aec5ad' into merge-2.4

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

fuzzymeanshifttracker.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +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

added variational stereo correspondence (by Sergey Kosov) and polynomial fitting (by Onkar Raut)

2011-06-15 12:10:33 +00:00

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

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

rgbdodometry.cpp

Move legacy part of opencv_contrib to separate header

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

selfsimilarity.cpp

Remove all using directives for STL namespace and members

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

spinimages.cpp

Move legacy part of opencv_contrib to separate header

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

stereovar.cpp

Merge commit '43aec5ad' into merge-2.4

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