Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/include/opencv2/calib3d/calib3d.hpp modules/contrib/doc/facerec/facerec_api.rst modules/contrib/include/opencv2/contrib/contrib.hpp modules/contrib/src/facerec.cpp modules/core/include/opencv2/core/mat.hpp modules/features2d/include/opencv2/features2d/features2d.hpp modules/highgui/src/loadsave.cpp modules/imgproc/src/pyramids.cpp modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp modules/python/src2/gen.py modules/python/test/test.py modules/superres/test/test_superres.cpp samples/cpp/facerec_demo.cpp		2014-07-08 14:33:56 +04:00
..
pics	Merge remote-tracking branch 'upstream/master'	2013-09-26 23:08:23 +10:00
feature_detection.rst	Issue #3709 - PyBindings for LSD	2014-06-03 14:25:33 +05:30
filtering.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-07-08 14:33:56 +04:00
geometric_transformations.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
histograms.rst	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
imgproc.rst	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst	Updating missed defines in documentation	2014-05-27 18:09:12 +01:00
motion_analysis_and_object_tracking.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
object_detection.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00