projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6113c6 0b4eb6a)
Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 May 2014 14:39:20 +0000 (18:39 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 May 2014 14:39:20 +0000 (18:39 +0400)
commit3d7a457c97426f0cf24a6e2e11c75109ef2674ab
tree6d94f524f007102990f4ec7f5711bb2d87094e15tree | snapshot
parentc6113c6cb39716068e86cf2c96f3b728e85be1e6commit | diff
parent0b4eb6a9643f588aa2010ff39b16adc42013f00ecommit | diff
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
24 files changed:
cmake/templates/OpenCVConfig.cmake.in diff1 | diff2 | blob | history
doc/tutorials/core/basic_linear_transform/basic_linear_transform.rst diff1 | diff2 | blob | history
doc/tutorials/introduction/linux_install/linux_install.rst diff1 | diff2 | blob | history
doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.rst diff1 | diff2 | blob | history
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst diff1 | diff2 | blob | history
modules/core/doc/drawing_functions.rst diff1 | diff2 | blob | history
modules/core/doc/operations_on_arrays.rst diff1 | diff2 | blob | history
modules/core/include/opencv2/core.hpp diff1 | | blob | history
modules/core/src/matrix.cpp diff1 | diff2 | blob | history
modules/core/test/test_math.cpp diff1 | diff2 | blob | history
modules/cudawarping/src/cuda/resize.cu diff1 | | blob | history
modules/flann/include/opencv2/flann/autotuned_index.h diff1 | diff2 | blob | history
modules/flann/include/opencv2/flann/params.h diff1 | diff2 | blob | history
modules/highgui/src/cap_gstreamer.cpp diff1 | diff2 | blob | history
modules/highgui/src/window_w32.cpp diff1 | diff2 | blob | history
modules/imgproc/doc/geometric_transformations.rst diff1 | diff2 | blob | history
modules/imgproc/doc/miscellaneous_transformations.rst diff1 | diff2 | blob | history
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst diff1 | diff2 | blob | history
modules/imgproc/src/filter.cpp diff1 | diff2 | blob | history
modules/imgproc/src/smooth.cpp diff1 | diff2 | blob | history
modules/ml/src/tree.cpp diff1 | diff2 | blob | history
modules/nonfree/doc/feature_detection.rst diff1 | diff2 | blob | history
modules/video/src/bgfg_gaussmix2.cpp diff1 | diff2 | blob | history
samples/cpp/kmeans.cpp diff1 | diff2 | blob | history
Domain: Multimedia / Media Vision;