doc · 0c7663eb3bfe2a0e11f786f7d3e3dc4467b285d2 · submodule / opencv · GitLab

History Find file

Merge branch 'master' into gpu-cuda-rename · 1ad4592b

Vladislav Vinogradov authored Sep 04, 2013

Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp

1ad4592b

Name	Last commit	Last update
..
_static		Loading commit data...
_themes/blue		Loading commit data...
pattern_tools		Loading commit data...
tutorials		Loading commit data...
user_guide		Loading commit data...
vidsurv		Loading commit data...
CMakeLists.txt		Loading commit data...
Doxyfile.in		Loading commit data...
acircles_pattern.png		Loading commit data...
check_docs.py		Loading commit data...
check_docs2.py		Loading commit data...
check_docs_whitelist.txt		Loading commit data...
conf.py		Loading commit data...
haartraining.htm		Loading commit data...
license.txt		Loading commit data...
mymath.sty		Loading commit data...
ocv.py		Loading commit data...
opencv-logo-white.png		Loading commit data...
opencv-logo.png		Loading commit data...
opencv-logo2.png		Loading commit data...
opencv.bib		Loading commit data...
opencv.ico		Loading commit data...
opencv.jpg		Loading commit data...
opencv_cheatsheet.tex		Loading commit data...
packaging.txt		Loading commit data...
patch_refman_latex.py		Loading commit data...
pattern.png		Loading commit data...
reformat.py		Loading commit data...