Roman Donchenko 3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp

2014-05-19 18:39:20 +04:00

..

android

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

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

c

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

2014-02-03 13:23:59 +04:00

cpp

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

2014-05-19 18:39:20 +04:00

directx

renamed **2 -> **

2014-02-04 19:55:11 +04:00

gpu

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

2014-03-24 19:02:16 +04:00

java

add clojure sample

2013-12-11 13:26:47 +01:00

MacOSX/FaceTracker

Converted tabs to spaces.

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

python2

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

2014-03-31 14:42:00 +04:00

tapi

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

2014-02-03 13:23:59 +04:00

winrt

typos

2014-03-02 21:04:17 +04:00

CMakeLists.txt

one more ocl deletion

2014-02-01 21:50:14 +04:00