opencv/modules/java/generator/src/cpp
Roman Donchenko 2c4bbb313c 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
2013-08-27 13:26:44 +04:00
..
common.h Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
converters.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
converters.h Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
core_manual.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
core_manual.hpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
features2d_manual.hpp Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
jni_part.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
Mat.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
utils.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00