Vadim Pisarevsky 2a42960ff2 Merge branch 'master' of https://github.com/nevion/opencv into cc		2012-12-15 21:45:55 +04:00
..
android	Merge branch 2.4	2012-12-14 14:46:41 +04:00
c	Merge branch 2.4	2012-11-13 19:54:48 +04:00
cpp	Merge branch 'master' of https://github.com/nevion/opencv into cc	2012-12-15 21:45:55 +04:00
gpu	Merge branch 2.4	2012-11-13 19:54:48 +04:00
MacOSX/FaceTracker	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ocl	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
python	add #/usr/bin/env python to all python files	2012-11-23 22:57:22 +04:00
python2	add #/usr/bin/env python to all python files	2012-11-23 22:57:22 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00