Andrey Kamaev 57d3152cd0 Merge branch '2.4'		2013-01-31 14:35:27 +04:00
..
android	Merge release 2.4.3.2	2012-12-25 19:07:08 +04:00
c	Merge branch '2.4'	2013-01-25 16:30:36 +04:00
cpp	Merge branch '2.4'	2013-01-30 15:12:50 +04:00
gpu	fixes for gpu module:	2013-01-23 21:05:06 +04:00
MacOSX/FaceTracker	Normalize whitespace in documentation and text files	2012-10-17 21:42:09 +04:00
ocl	Fix build warnings in OpenCL samples	2013-01-30 17:25:03 +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