Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
include/opencv2	updated demos and tutorial regarding the Retina class transfer to bioinspired module.	2013-06-12 22:43:36 +02:00
src	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
CMakeLists.txt	Move cv::KeyPoint and cv::DMatch to core	2013-03-26 16:08:43 +04:00