Roman Donchenko 2f780ed994 Fix whitespace errors.		2013-08-06 18:07:00 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4'	2013-08-06 13:56:49 +04:00
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	Fix whitespace errors.	2013-08-06 18:07:00 +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'	2013-08-06 13:56:49 +04:00