opencv/modules/imgproc
Roman Donchenko feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +04:00
..
doc boxpoints documentation 2013-06-24 16:17:23 +05:30
include/opencv2 Added cv2.boxPoints() functionality to Python bindings (Feature #2023) 2013-06-24 12:13:59 +05:30
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
test Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
CMakeLists.txt Global CMake reorganization: 2012-02-03 11:26:49 +00:00