Roman Donchenko 4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt

2013-10-22 14:28:00 +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

Boring changes - contrib.

2013-09-05 19:02:59 +04:00

facerec.cpp

Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.

2013-09-05 19:03:00 +04: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 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

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

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