Alexander Alekhin e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4
*  from StevenPuttemans:bugfix_3283
*  from alalek:ocl_test_fix_rng
*  from alalek:cmake_install_win
*  from ilya-lavrenov:ipp_warn_fix
*  from alalek:perf_simple_strategy
*  from alalek:svm_workaround
*  from alalek:ocl_fix_cl_double
*  from ilya-lavrenov:ocl_setto_opencl12
*  from asmorkalov:android_fd_cp_fix
*  from ilya-lavrenov:ocl_norm
*  from sperrholz:ocl-arithm-additions
*  from ilya-lavrenov:ocl_setto_win_fix
*  from ilya-lavrenov:pr1582_fix
*  from alalek:ocl_remove_cl_hpp_h
*  from alalek:ocl_program_cache_update
*  from ilya-lavrenov:ocl_war_on_double
*  from ilya-lavrenov:ocl_perf
*  from alalek:cl_code_cleanup
*  from alalek:test_fix_run_py
*  from alalek:ocl_fix_cleanup
*  from alalek:ocl_fix_build_mac
*  from ilya-lavrenov:ocl_mac_kernel_warnings
*  from ilya-lavrenov:ocl_fix_tvl1_and_sparse
*  from alalek:ocl_test_dump_info
*  from ilya-lavrenov:ocl_disable_svm_noblas
*  from alalek:ocl_fixes
*  from ilya-lavrenov:ocl_imgproc
*  from ilya-lavrenov:ocl_fft_cleanup
*  from alalek:fix_warn_upd_haar
*  from ilya-lavrenov:ocl_some_optimization
*  from alalek:ocl_fix_perf_kalman
*  from alalek:ocl_fix_string_info
*  from ilya-lavrenov:ocl_svm_misprint
*  from ilya-lavrenov:ocl_cvtColor
*  from ilya-lavrenov:ocl_info
*  from a0byte:2.4
*  from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
..
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:25 +04:00
2013-09-02 14:00:44 +04:00
2011-07-08 14:34:03 +00:00
2012-08-07 13:22:41 +04:00
2013-08-21 18:59:24 +04:00