Merge pull request #610 from AoD314:webp2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)
commitfb760953784fe723de81d624a4720ddca1d1c786
tree996f6feeaf0f7af666e7ea513cc8ed69a3815fe7
parent9b7dfd677db5818b8dd699e2059c886a1e7ce24f
parent9680176fa9471290a562e9af353b806bb6aea663
Merge pull request #610 from AoD314:webp2
CMakeLists.txt
modules/highgui/CMakeLists.txt