Merge pull request #645 from taka-no-me:bump_headers

author Andrey Kamaev <andrey.kamaev@itseez.com>

Thu, 14 Mar 2013 07:42:22 +0000 (11:42 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Thu, 14 Mar 2013 07:42:23 +0000 (11:42 +0400)
author Andrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Mar 2013 07:42:22 +0000 (11:42 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Mar 2013 07:42:23 +0000 (11:42 +0400)
diff --cc modules/highgui/src/grfmt_webp.cpp
Simple merge
diff --cc modules/stitching/src/matchers.cpp
Simple merge
author	Andrey Kamaev <andrey.kamaev@itseez.com>
	Thu, 14 Mar 2013 07:42:22 +0000 (11:42 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Thu, 14 Mar 2013 07:42:23 +0000 (11:42 +0400)
		1	2
modules/highgui/src/grfmt_webp.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/matchers.cpp	patch \|	diff1 \|	diff2 \|	blob \| history