Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp		2013-07-08 18:47:38 +04:00
..
android	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-08 18:47:38 +04:00
c	Compile OpenCV with GCC visibility set to hidden	2013-05-13 18:33:20 +04:00
cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
gpu	fix gpu::DeviceInfo compilation under linux	2013-06-24 10:11:44 +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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
python2	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
winrt/ImageManipulations	Path to OpenCV dll libs fixes.	2013-06-28 16:48:27 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00