Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
This commit is contained in:
Roman Donchenko
2013-08-27 13:26:44 +04:00
448 changed files with 984 additions and 1307 deletions

View File

@@ -4,4 +4,4 @@ import os
import shutil
for f in os.listdir("."):
shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));
shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));

View File

@@ -30,4 +30,4 @@ interface OpenCVEngineInterface
* @return Returns names of OpenCV libraries, separated by semicolon.
*/
String getLibraryList(String version);
}
}