zio dodo 5f7163bff2 Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial ... Conflicts: modules/stitching/src/motion_estimators.cpp		2013-08-29 20:12:12 +02:00
..
android	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
c	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
cpp	Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial	2013-08-29 20:12:12 +02:00
gpu	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
java	Normalized file endings.	2013-08-21 18:59:25 +04:00
MacOSX/FaceTracker	Converted tabs to spaces.	2013-08-21 18:59:26 +04:00
ocl	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
python2	War on Whitespace, master edition: tabs.	2013-08-27 17:13:53 +04:00
winrt/ImageManipulations	Converted tabs to spaces.	2013-08-21 18:59:26 +04:00
CMakeLists.txt	add an ocl sample	2012-08-08 17:12:53 +08:00