opencv/modules
Roman Donchenko bae85660da Merge remote-tracking branch 'origin/2.4'
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
2013-06-05 15:42:07 +04:00
..
androidcamera Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
contrib Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
flann Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
gpu Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
highgui Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
java Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-05-27 16:58:04 +04:00
legacy Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
ml Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
nonfree Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
objdetect Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
ocl Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
photo Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
python Merge pull request #881 from apavlenko:hidden_visibility 2013-05-13 22:08:45 +04:00
softcascade Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stitching Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
superres Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
ts Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-05-27 16:58:04 +04:00
video Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
videostab Changed visibility of the virtual functions in OnePassStabilizer and TwoPassStabilizer that are derived from StabilizerBase from private to protected to enable stabilizer implementations that are derived from OnePassStabilizer and TwoPassStabilier to properly overwrite these functions 2013-04-24 07:33:22 +02:00
world Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
CMakeLists.txt Added compatibility headers 2013-03-13 17:26:56 +04:00
refman.rst.in Made reference manual table of contents autogenerated 2012-05-30 14:06:47 +00:00