• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' · bae85660
    Roman Donchenko authored
    Pull requests:
    	#943 from jet47:cuda-5.5-support
    	#944 from jet47:cmake-2.8.11-cuda-fix
    	#912 from SpecLad:contributing
    	#934 from SpecLad:parallel-for
    	#931 from jet47:gpu-test-fixes
    	#932 from bitwangyaoyao:2.4_fixBFM
    	#918 from bitwangyaoyao:2.4_samples
    	#924 from pengx17:2.4_arithm_fix
    	#925 from pengx17:2.4_canny_tmp_fix
    	#927 from bitwangyaoyao:2.4_perf
    	#930 from pengx17:2.4_haar_ext
    	#928 from apavlenko:bugfix_3027
    	#920 from asmorkalov:android_move
    	#910 from pengx17:2.4_oclgfft
    	#913 from janm399:2.4
    	#916 from bitwangyaoyao:2.4_fixPyrLK
    	#919 from abidrahmank:2.4
    	#923 from pengx17:2.4_macfix
    
    Conflicts:
    	modules/calib3d/src/stereobm.cpp
    	modules/features2d/src/detectors.cpp
    	modules/gpu/src/error.cpp
    	modules/gpu/src/precomp.hpp
    	modules/imgproc/src/distransform.cpp
    	modules/imgproc/src/morph.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/perf/perf_imgproc.cpp
    	modules/ocl/perf/perf_match_template.cpp
    	modules/ocl/perf/precomp.cpp
    	modules/ocl/perf/precomp.hpp
    	modules/ocl/src/arithm.cpp
    	modules/ocl/src/canny.cpp
    	modules/ocl/src/filtering.cpp
    	modules/ocl/src/haar.cpp
    	modules/ocl/src/hog.cpp
    	modules/ocl/src/imgproc.cpp
    	modules/ocl/src/opencl/haarobjectdetect.cl
    	modules/ocl/src/pyrlk.cpp
    	modules/video/src/bgfg_gaussmix2.cpp
    	modules/video/src/lkpyramid.cpp
    	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
    	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
    	platforms/scripts/ABI_compat_generator.py
    	samples/ocl/facedetect.cpp
    bae85660
Name
Last commit
Last update
..
data Loading commit data...
_coverage.py Loading commit data...
_doc.py Loading commit data...
asift.py Loading commit data...
browse.py Loading commit data...
calibrate.py Loading commit data...
camshift.py Loading commit data...
coherence.py Loading commit data...
color_histogram.py Loading commit data...
common.py Loading commit data...
contours.py Loading commit data...
deconvolution.py Loading commit data...
demo.py Loading commit data...
dft.py Loading commit data...
digits.py Loading commit data...
digits_adjust.py Loading commit data...
digits_video.py Loading commit data...
distrans.py Loading commit data...
edge.py Loading commit data...
facedetect.py Loading commit data...
facerec_demo.py Loading commit data...
feature_homography.py Loading commit data...
find_obj.py Loading commit data...
fitline.py Loading commit data...
floodfill.py Loading commit data...
gabor_threads.py Loading commit data...
gaussian_mix.py Loading commit data...
grabcut.py Loading commit data...
hist.py Loading commit data...
houghcircles.py Loading commit data...
houghlines.py Loading commit data...
inpaint.py Loading commit data...
kmeans.py Loading commit data...
lappyr.py Loading commit data...
letter_recog.py Loading commit data...
lk_homography.py Loading commit data...
lk_track.py Loading commit data...
morphology.py Loading commit data...
mosse.py Loading commit data...
motempl.py Loading commit data...
mouse_and_match.py Loading commit data...
mser.py Loading commit data...
opt_flow.py Loading commit data...
peopledetect.py Loading commit data...
plane_ar.py Loading commit data...
plane_tracker.py Loading commit data...
squares.py Loading commit data...
stereo_match.py Loading commit data...
texture_flow.py Loading commit data...
turing.py Loading commit data...
video.py Loading commit data...
video_dmtx.py Loading commit data...
video_threaded.py Loading commit data...
watershed.py Loading commit data...