Merge pull request #543 from taka-no-me:explicit_stl
authorcuda-geek <marina.kolpakova@itseez.com>
Tue, 26 Feb 2013 16:54:12 +0000 (20:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Feb 2013 16:54:13 +0000 (20:54 +0400)
1  2 
modules/ml/include/opencv2/ml/ml.hpp
modules/softcascade/include/opencv2/softcascade/softcascade.hpp
modules/softcascade/src/integral_channel_builder.cpp
modules/softcascade/src/softcascade.cpp

Simple merge