Roman Donchenko 9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp

2013-12-16 15:02:12 +04:00

..

android

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

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

c

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

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

cpp

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

2013-12-16 15:02:12 +04:00

gpu

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

2013-11-05 16:38:23 +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

ocl

fixed facedetect sample

2013-12-11 15:08:49 +04:00

python2

mouse_and_match.py missing import cv2

2013-11-24 15:58:13 +01:00

winrt

Filter selection and several filters implemented for WinRT sample.

2013-11-29 09:47:25 +04:00

CMakeLists.txt

cmake: revert CRT linkage option for MSVS

2013-10-09 17:49:11 +04:00