Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial
authorzio dodo <domenicobloisi@yahoo.com>
Thu, 29 Aug 2013 18:12:12 +0000 (20:12 +0200)
committerzio dodo <domenicobloisi@yahoo.com>
Thu, 29 Aug 2013 18:12:12 +0000 (20:12 +0200)
commit5f7163bff284699e90032a69c07efba79934b6e5
treeae96ccecf9355af3e46fcd84cae117a04472ce35
parent281250ba0e1c9189a457cf1aeda06a4196d86dbf
parentfc37df05ecd7f164033b6398a5749c7d7604fb7b
Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial

Conflicts:
modules/stitching/src/motion_estimators.cpp
modules/stitching/src/motion_estimators.cpp