Roman Donchenko e59c74e1c7 Merge pull request #1348 from SpecLad:merge-2.4		2013-08-28 13:41:41 +04:00
..
doc	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
include/opencv2	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
test	Merge pull request #1348 from SpecLad:merge-2.4	2013-08-28 13:41:41 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00