Merge branch 'master' of https://github.com/Itseez/opencv
authorsprice <seth@planet-labs.com>
Thu, 6 Mar 2014 23:39:06 +0000 (15:39 -0800)
committersprice <seth@planet-labs.com>
Thu, 6 Mar 2014 23:39:06 +0000 (15:39 -0800)
commit75ed2f52f18c15e966136b7ece38e85d5760c2f3
treeaa1ef6f666d89c1f7d4f605af521041c9b635c74
parent1c15776cf57aa88bb9a0d5cb742a94880cb97c5f
parentd1d451c952d9650c859b721431a0852eae95c844
Merge branch 'master' of https://github.com/Itseez/opencv

Conflicts:
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/freak.cpp
modules/features2d/src/stardetector.cpp
modules/imgproc/src/sumpixels.cpp