projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 964b260 133d861)
Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 8 Jul 2014 10:33:56 +0000 (14:33 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 8 Jul 2014 10:33:56 +0000 (14:33 +0400)
commita3bde36c84d0ff2fe818ec409900115b2013eff6
tree1f13fc567ce086d39f4b9b74d09a3111816c3f8atree | snapshot
parent964b2609373f0de2737ef0a607183b6c1132b17acommit | diff
parent133d861d658f7e32b16a107f09570b2f35d77d25commit | diff
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
14 files changed:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst diff1 | diff2 | blob | history
modules/calib3d/include/opencv2/calib3d.hpp diff1 | | blob | history
modules/calib3d/src/fisheye.cpp | diff2 | blob | history
modules/calib3d/test/test_fisheye.cpp | diff2 | blob | history
modules/core/include/opencv2/core/core_c.h diff1 | diff2 | blob | history
modules/core/include/opencv2/core/mat.inl.hpp diff1 | | blob | history
modules/core/include/opencv2/core/types_c.h diff1 | diff2 | blob | history
modules/features2d/include/opencv2/features2d.hpp diff1 | | blob | history
modules/flann/include/opencv2/flann/dist.h diff1 | diff2 | blob | history
modules/flann/include/opencv2/flann/lsh_table.h diff1 | diff2 | blob | history
modules/highgui/src/loadsave.cpp diff1 | diff2 | blob | history
modules/imgproc/doc/filtering.rst diff1 | diff2 | blob | history
modules/imgproc/src/pyramids.cpp diff1 | diff2 | blob | history
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java diff1 | diff2 | blob | history
Domain: Multimedia / Media Vision;