Vladislav Vinogradov 98bd401534 fix gpu::DeviceInfo compilation under linux ... glibc defines major and minor macros which conflict with gpu::DeviceInfo methods with the same name		2013-06-24 10:11:44 +04:00
..
android	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
c	Compile OpenCV with GCC visibility set to hidden	2013-05-13 18:33:20 +04:00
cpp	Merge pull request #1015 from SpecLad:merge-2.4	2013-06-21 17:38:04 +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-06-10 18:18:01 +04:00
python2	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00