Vadim Pisarevsky 3942b1f362 Merge pull request #5340 from alalek:ocl_off		2015-11-10 16:53:36 +00:00
..
include/opencv2
misc/java
perf
src	Merge pull request #5340 from alalek:ocl_off	2015-11-10 16:53:36 +00:00
test	fixed memory leak in descriptor regression tests	2015-09-13 12:14:30 +02:00
CMakeLists.txt