opencv/modules/androidcamera
Roman Donchenko bae85660da Merge remote-tracking branch 'origin/2.4'
Pull requests:
	 from jet47:cuda-5.5-support
	 from jet47:cmake-2.8.11-cuda-fix
	 from SpecLad:contributing
	 from SpecLad:parallel-for
	 from jet47:gpu-test-fixes
	 from bitwangyaoyao:2.4_fixBFM
	 from bitwangyaoyao:2.4_samples
	 from pengx17:2.4_arithm_fix
	 from pengx17:2.4_canny_tmp_fix
	 from bitwangyaoyao:2.4_perf
	 from pengx17:2.4_haar_ext
	 from apavlenko:bugfix_3027
	 from asmorkalov:android_move
	 from pengx17:2.4_oclgfft
	 from janm399:2.4
	 from bitwangyaoyao:2.4_fixPyrLK
	 from abidrahmank:2.4
	 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
..
camera_wrapper Front/Back camera semantic support added to Android VideoCapture back-end. 2013-04-24 10:56:16 +04:00
include Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
src Finalize core headers reorganization 2013-04-03 14:10:03 +04:00
CMakeLists.txt android -> plarforms/android 2013-05-27 11:10:38 +04:00