Merge pull request #1932 from seth-planet:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
commitf417c79d16a18fde33174e20d42f37d6bfda408d
tree76ba0203820a9023b127d5f78bd6357ed2dfc37a
parent604a64b2060f1f53f68764ca89b6c468d746ab5c
parent75ed2f52f18c15e966136b7ece38e85d5760c2f3
Merge pull request #1932 from seth-planet:master
modules/features2d/include/opencv2/features2d.hpp
modules/imgproc/src/sumpixels.cpp