Mathieu Barnachon 63c23cce65 Merge remote-tracking branch 'upstream/master' into svm_hog		2013-11-24 13:24:39 +01:00
..
doc	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
include/opencv2	Merge remote-tracking branch 'upstream/master' into svm_hog	2013-11-24 13:24:39 +01:00
src	Merge remote-tracking branch 'upstream/master' into svm_hog	2013-11-24 13:24:39 +01:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00