Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp		2013-07-08 18:47:38 +04:00
..
images	minor Android tutorial fixes	2013-03-01 13:52:14 +04:00
android_dev_intro.rst	minor Android tutorial fixes	2013-03-01 13:52:14 +04:00
dev_with_OCV_on_Android.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
O4A_SDK.rst	OpenCV Manager version++.	2013-07-05 12:07:04 +04:00