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
..
vtk	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-07-08 14:33:56 +04:00
clouds.cpp	Added cloud shading support - additional normals array is used	2014-04-08 20:31:28 +04:00
precomp.hpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
shapes.cpp	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
types.cpp	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00
viz3d.cpp	fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.	2014-02-15 20:08:04 +04:00
vizcore.cpp	iteractor work	2014-03-02 23:15:53 +04:00
vizimpl.cpp	Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry)	2014-03-16 20:07:05 +04:00
vizimpl.hpp	iteractor work	2014-03-02 23:15:53 +04:00
widget.cpp	Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style	2014-01-20 22:51:33 +04:00