Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 27 May 2013 12:58:04 +0000 (16:58 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 27 May 2013 12:58:04 +0000 (16:58 +0400)
commit5ac3b8d5d82fbeebd76cdd75433fabc9f56eff5b
tree6ed8fb95486cf8ead0711ed7bf150718a4d60f3d
parent56121d01ea759f9f4dd89ed4a8f42d8816b04300
parent324cafdda68bdc5cee73c673a904a1f681801572
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info

Conflicts:
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/hog.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/tvl1flow.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/opencl/arithm_mul.cl
modules/ocl/src/tvl1flow.cpp