Commit a534af68 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #14037 from alalek:update_version_4.1.0-pre

parents 8c0b0714 6e2ede8c
......@@ -36,14 +36,14 @@ Open your Doxyfile using your favorite text editor and search for the key
`TAGFILES`. Change it as follows:
@code
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.0.1
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.1.0
@endcode
If you had other definitions already, you can append the line using a `\`:
@code
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.0.1
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.1.0
@endcode
Doxygen can now use the information from the tag file to link to the OpenCV
......
......@@ -6,9 +6,9 @@
#define OPENCV_VERSION_HPP
#define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 0
#define CV_VERSION_REVISION 1
#define CV_VERSION_STATUS "-dev"
#define CV_VERSION_MINOR 1
#define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-pre"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
......
......@@ -9,7 +9,7 @@ def main():
os.chdir(SCRIPT_DIR)
package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '4.0.1') # TODO
package_version = os.environ.get('OPENCV_VERSION', '4.1.0') # TODO
long_description = 'Open Source Computer Vision Library Python bindings' # TODO
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.0.1</version>
<version>4.1.0</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-it</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.0.1</version>
<version>4.1.0</version>
</parent>
<groupId>org.opencv</groupId>
<artifactId>opencv</artifactId>
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId>
<version>4.0.1</version>
<version>4.1.0</version>
<packaging>pom</packaging>
<name>OpenCV Parent POM</name>
<licenses>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment