Roman Donchenko 1590a1a538 Merge pull request #1068 from AoD314:webp2		2013-07-15 11:45:28 +04:00
..
doc	Added missing python functions in highgui documentation	2013-06-24 15:53:45 +05:30
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
src	Merge pull request #1068 from AoD314:webp2	2013-07-15 11:45:28 +04:00
test	Merge pull request #1068 from AoD314:webp2	2013-07-15 11:45:28 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00