Merge pull request #610 from AoD314:webp2

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

Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
author Andrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc modules/highgui/CMakeLists.txt
Simple merge
author	Andrey Kamaev <andrey.kamaev@itseez.com>
	Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
modules/highgui/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history