Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp

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

..

androidcamera

Native camera libraries updated.

2013-08-29 18:46:45 +04:00

bioinspired

Suppressed -Wundef in bioinspired, because of OpenCL headers.

2013-10-22 15:16:22 +04:00

calib3d

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

2013-10-28 13:38:25 +04:00

contrib

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

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

core

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

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

cuda

moved BufferPool management functions to public

2013-10-08 17:21:22 +04:00

cudaarithm

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

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

cudabgsegm

Merge branch 'master' into gpu-cuda-rename

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

cudacodec

switched to new device layer in gpucodec module

2013-09-23 12:16:57 +04:00

cudafeatures2d

removed precomp.cpp files

2013-09-02 14:00:44 +04:00

cudafilters

Merge branch 'master' into gpu-cuda-rename

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

cudaimgproc

Merge branch 'master' into gpu-cuda-rename

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

cudalegacy

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

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

cudaoptflow

Merge branch 'master' into gpu-cuda-rename

2013-09-04 09:58:32 +04:00

cudastereo

Fix a typo in kernel size

2013-10-11 23:31:31 -04:00

cudawarping

Small OpenCV-CUDA bugs are fixed.

2013-10-22 12:08:43 +05:30

cudev

Merge pull request #1540 from jet47:gpuarithm-cudev

2013-10-21 16:34:45 +04:00

features2d

Minimized the number of arguments required to workaround the MSVC2013 compiler bug.

2013-10-21 21:43:26 +02:00

flann

Cherry-picked mariusmuja/flann@8c8b0e0cb8.

2013-10-02 16:09:45 +04:00

highgui

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

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

imgproc

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

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

java

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

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

legacy

the first draft of transparent API and new UMat class. more files

2013-10-22 14:05:15 +04:00

matlab

Replace $(Configuration) with $<CONFIGURATION>

2013-10-24 18:20:16 +01:00

ml

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

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

nonfree

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

2013-11-05 16:38:23 +04:00

objdetect

Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix

2013-10-29 16:03:51 +04:00

ocl

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

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

optim

Merge pull request #1521 from nailbiter:optimCG

2013-10-29 16:14:32 +04:00

photo

fixed warnings

2013-10-08 12:46:43 +04:00

python

Support PyString_AsString() in Python 3 < 3.3

2013-11-07 23:47:33 -05:00

shape

Merge pull request #1567 from ilya-lavrenov:warn_fix

2013-10-08 13:50:49 +04:00

softcascade

Merge branch 'master' into gpu-cuda-rename

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

stitching

Named GraphCutSeamFinderBase to allow its usage in makePtr.

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

superres

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

2013-11-05 16:38:23 +04:00

ts

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

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

video

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

2013-11-05 16:38:23 +04:00

videostab

Merge branch 'master' into gpu-cuda-rename

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

viz

Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)

2013-10-03 02:10:27 +02:00

world

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

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

CMakeLists.txt

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

2013-06-10 18:18:01 +04:00

refman.rst.in

…