lluis 6ef1d456dd fixed rebase conflicts

2013-09-06 14:00:11 +02:00

..

objdetect

fixed rebase conflicts

2013-09-06 14:00:11 +02:00

objdetect.hpp

Boring changes - objdetect.

2013-09-05 19:02:58 +04:00