Ilya Lavrenov d9c5fbc9ba disable SURF		2014-03-06 16:49:22 +04:00
..
doc	fixed warnings from OCL and DOC builders	2014-02-04 21:19:31 +04:00
include/opencv2	Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray	2014-02-06 12:55:04 +04:00
perf	Merge pull request #2261 from jet47:stitching-cuda-android	2014-02-03 15:35:55 +04:00
src	disable SURF	2014-03-06 16:49:22 +04:00
test	Merge pull request #2261 from jet47:stitching-cuda-android	2014-02-03 15:35:55 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00