mirror of
https://github.com/opencv/opencv.git
synced 2024-12-06 02:29:14 +08:00
5ac3b8d5d8
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 |
||
---|---|---|
.. | ||
cpp | ||
java |