generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial

Browse Source 
Conflicts:
	modules/stitching/src/motion_estimators.cpp
This commit is contained in:
zio dodo
2013-08-29 20:12:12 +02:00
parent 281250ba0e fc37df05ec
commit 5f7163bff2
830 changed files with 12006 additions and 9379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tutorials/definitions/README.txt
View File

@@ -1 +1 @@
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.