• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 9218f497
    Roman Donchenko authored
    Conflicts:
    	modules/contrib/src/retina.cpp
    	modules/gpu/perf/perf_video.cpp
    	modules/gpuoptflow/src/tvl1flow.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_calib3d.cpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/perf/perf_match_template.cpp
    	modules/ocl/src/precomp.hpp
    	samples/gpu/stereo_multi.cpp
    9218f497
Name
Last commit
Last update
..
files_Qt Loading commit data...
bitstrm.cpp Loading commit data...
bitstrm.hpp Loading commit data...
cap.cpp Loading commit data...
cap_android.cpp Loading commit data...
cap_avfoundation.mm Loading commit data...
cap_cmu.cpp Loading commit data...
cap_dc1394.cpp Loading commit data...
cap_dc1394_v2.cpp Loading commit data...
cap_dshow.cpp Loading commit data...
cap_ffmpeg.cpp Loading commit data...
cap_ffmpeg_api.hpp Loading commit data...
cap_ffmpeg_impl.hpp Loading commit data...
cap_giganetix.cpp Loading commit data...
cap_gstreamer.cpp Loading commit data...
cap_images.cpp Loading commit data...
cap_ios_abstract_camera.mm Loading commit data...
cap_ios_photo_camera.mm Loading commit data...
cap_ios_video_camera.mm Loading commit data...
cap_libv4l.cpp Loading commit data...
cap_msmf.cpp Loading commit data...
cap_openni.cpp Loading commit data...
cap_pvapi.cpp Loading commit data...
cap_qt.cpp Loading commit data...
cap_qtkit.mm Loading commit data...
cap_unicap.cpp Loading commit data...
cap_v4l.cpp Loading commit data...
cap_vfw.cpp Loading commit data...
cap_ximea.cpp Loading commit data...
cap_xine.cpp Loading commit data...
ffmpeg_codecs.hpp Loading commit data...
grfmt_base.cpp Loading commit data...
grfmt_base.hpp Loading commit data...
grfmt_bmp.cpp Loading commit data...
grfmt_bmp.hpp Loading commit data...
grfmt_exr.cpp Loading commit data...
grfmt_exr.hpp Loading commit data...
grfmt_jpeg.cpp Loading commit data...
grfmt_jpeg.hpp Loading commit data...
grfmt_jpeg2000.cpp Loading commit data...
grfmt_jpeg2000.hpp Loading commit data...
grfmt_png.cpp Loading commit data...
grfmt_png.hpp Loading commit data...
grfmt_pxm.cpp Loading commit data...
grfmt_pxm.hpp Loading commit data...
grfmt_sunras.cpp Loading commit data...
grfmt_sunras.hpp Loading commit data...
grfmt_tiff.cpp Loading commit data...
grfmt_tiff.hpp Loading commit data...
grfmt_webp.cpp Loading commit data...
grfmt_webp.hpp Loading commit data...
grfmts.hpp Loading commit data...
ios_conversions.mm Loading commit data...
loadsave.cpp Loading commit data...
precomp.hpp Loading commit data...
utils.cpp Loading commit data...
utils.hpp Loading commit data...
window.cpp Loading commit data...
window_QT.cpp Loading commit data...
window_QT.h Loading commit data...
window_QT.qrc Loading commit data...
window_carbon.cpp Loading commit data...
window_cocoa.mm Loading commit data...
window_gtk.cpp Loading commit data...
window_w32.cpp Loading commit data...