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
..
doc	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
include/opencv2	added handling of camera parameters estimation errors (#3122)	2013-07-03 15:20:14 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial	2013-08-29 20:12:12 +02:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00