opencv

History

Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp

2014-07-08 14:33:56 +04:00

android_binary_package

Fix typos

2014-06-16 18:48:10 +08:00

clojure_dev_intro

add tutorial content

2013-12-11 13:30:52 +01:00

crosscompilation

NEON instruction set control unified for regular and cross-compiler builds.

2013-12-20 16:02:37 +04:00

desktop_java

Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial.