alexandre benoit 72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process		2013-04-29 19:06:35 +02:00
..
android	Merge branch '2.4'	2013-04-12 15:35:38 +04:00
c	Move legacy part of opencv_contrib to separate header	2013-04-12 19:37:40 +04:00
cpp	resolved conflicts, updated retina class interface and optimized a heavy retinacolor process	2013-04-29 19:06:35 +02:00
gpu	Revert "Merge pull request #836 from jet47:gpu-modules"	2013-04-18 15:03:50 +04:00
java	fixing issues from http://www.code.opencv.org/issues/2807	2013-02-28 19:11:24 +04:00
MacOSX/FaceTracker	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ocl	Remove C API from OpenCL module	2013-04-12 14:37:02 +04:00
python2	Drop old python samples and tests	2013-04-12 19:37:40 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00