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

merged revisions r7802,r7804,r7805 from 2.4 branch

Browse Source
This commit is contained in:
Alexander Shishkov
2012-04-03 00:33:33 +00:00
parent 56b5e6d8a8
commit 9bfd50e6ae
5 changed files with 207 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/conf.py
View File

@@ -42,7 +42,7 @@ master_doc = 'index'
# General information about the project.
project = u'OpenCV'
copyright = u'2011, opencv dev team'
copyright = u'2011-2012, opencv dev team'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -56,7 +56,7 @@ version_patch = re.search("^W*#\W*define\W+CV_SUBMINOR_VERSION\W+(\d+)\W*$", ver
# The short X.Y version.
version = version_major + '.' + version_minor
# The full version, including alpha/beta/rc tags.
release = version_major + '.' + version_minor + '.' + version_patch
release = version_major + '.' + version_minor + '.' + version_patch + "-beta"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -117,7 +117,7 @@ html_theme_path = ['_themes']
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = 'opencv-logo2.png'
html_logo = 'opencv-logo-white.png'
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32