Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
authorcuda-geek <marina.kolpakova@itseez.com>
Mon, 18 Mar 2013 11:34:02 +0000 (15:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Mar 2013 11:34:02 +0000 (15:34 +0400)
commit3f8d87d82c293484a2d6bce6143a0bf6f2760dc8
tree36a96dd6e621fd1c7adeaf69ce99430ef942af75
parentf768d8c93f8683ad2cc793ceb6a7d900062f0084
parent43db0d543de863da02792bb96c02646c181278df
Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
modules/softcascade/include/opencv2/softcascade.hpp