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 |
||
|---|---|---|
| .. | ||
| vtkCloudMatSink.cpp | ||
| vtkCloudMatSink.h | ||
| vtkCloudMatSource.cpp | ||
| vtkCloudMatSource.h | ||
| vtkCocoaInteractorFix.mm | ||
| vtkImageMatSource.cpp | ||
| vtkImageMatSource.h | ||
| vtkOBJWriter.cpp | ||
| vtkOBJWriter.h | ||
| vtkTrajectorySource.cpp | ||
| vtkTrajectorySource.h | ||
| vtkVizInteractorStyle.cpp | ||
| vtkVizInteractorStyle.hpp | ||
| vtkXYZReader.cpp | ||
| vtkXYZReader.h | ||
| vtkXYZWriter.cpp | ||
| vtkXYZWriter.h | ||