generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
opencv/doc/tutorials/definitions
History
Roman Donchenko 9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
..
noContent.rst
Normalized file endings.
2013-08-21 18:59:25 +04:00
README.txt
Normalized file endings.
2013-08-21 18:59:25 +04:00
tocDefinitions.rst
Merge remote-tracking branch 'origin/2.4' into merge-2.4
2013-12-16 15:02:12 +04:00

README.txt 

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