Roman Donchenko 9ca80961fd Merge pull request #1874 from SpecLad:merge-2.4		2013-11-28 16:43:00 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-11 16:55:36 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-11 16:55:36 +04:00
perf	hopefully, the last test failures are fixed now	2013-10-24 23:31:00 +04:00
src	Merge pull request #1874 from SpecLad:merge-2.4	2013-11-28 16:43:00 +04:00
test	Merge pull request #1867 from ilya-lavrenov:ocl_resize_master	2013-11-27 18:08:11 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00