Merge pull request #1932 from seth-planet:master

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
diff --cc modules/features2d/include/opencv2/features2d.hpp
Simple merge
diff --cc modules/imgproc/src/sumpixels.cpp

index c32813f,abb99c5..6802916

mode 100644,100755..100755
--- 1/modules/imgproc/src/sumpixels.cpp
--- 2/modules/imgproc/src/sumpixels.cpp
+++ b/modules/imgproc/src/sumpixels.cpp
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Thu, 10 Apr 2014 09:36:14 +0000 (13:36 +0400)
		1	2
modules/features2d/include/opencv2/features2d.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/sumpixels.cpp	patch \|	diff1 \|	diff2 \|	blob \| history