Roman Donchenko 33087f9eaa Merge remote-tracking branch 'origin/2.4' into merge-2.4		2014-06-02 13:43:28 +04:00
..
doc	Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier	2014-01-30 13:32:32 +02:00
include/opencv2	Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier	2014-01-30 13:32:32 +02:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-06-02 13:43:28 +04:00
test	cv::norm -> cvtest::norm in tests	2014-04-08 14:49:20 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00