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

..

androidcamera

Native camera libraries updated.

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

bioinspired

Merge pull request #1581 from SpecLad:merge-2.4

2013-10-09 12:33:50 +04:00

calib3d

fixed warnings

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

contrib

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

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

core

Merge pull request #1575 from jet47:gpu-buffer-pool

2013-10-21 16:35:14 +04:00

cuda

moved BufferPool management functions to public

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

cudaarithm

used new device layer for cv::cuda::norm

2013-10-01 15:28:51 +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 branch 'master' into gpu-cuda-rename

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

Merge branch 'master' into gpu-cuda-rename

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

cudev

Merge pull request #1540 from jet47:gpuarithm-cudev

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

features2d

fixed warnings

2013-10-08 12:46:43 +04: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-10-22 14:28:00 +04:00

imgproc

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

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

java

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

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

legacy

Merge pull request #1536 from asmorkalov:android_ndk_r9_master

2013-10-04 16:36:44 +04:00

matlab

Updated documentation

2013-09-18 18:52:23 +10: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 'upstream/2.4' into merge-2.4

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

objdetect

fixed warnings

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

ocl

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

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

optim

fixed warnings

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

photo

fixed warnings

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

python

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

2013-10-15 20:08:52 +04: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-10-08 17:57: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 branch 'master' into gpu-cuda-rename

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

Deleted all trailing whitespace.

2013-08-21 18:59:24 +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

…