Roman Donchenko 10cb9a0c4a Merge pull request #1342 from nevion:master		2013-08-28 12:00:39 +04:00
..
doc	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
include/opencv2	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge pull request #1342 from nevion:master	2013-08-28 12:00:39 +04:00
test	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00