From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Fri, 4 Aug 2017 00:00:18 +0000 (+0000)
Subject: Merge tag '3.3.0'
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~740
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87c27a074db9f6d9d60513f351daa903606ca370;p=platform%2Fupstream%2Fopencv.git

Merge tag '3.3.0'

OpenCV 3.3.0
---

87c27a074db9f6d9d60513f351daa903606ca370
diff --cc modules/core/include/opencv2/core/version.hpp
index c48a403,b22b027..ca46377
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@@ -53,7 -53,7 +53,7 @@@
  #define CV_VERSION_MAJOR    3
  #define CV_VERSION_MINOR    3
  #define CV_VERSION_REVISION 0
- #define CV_VERSION_STATUS   "-rc"
 -#define CV_VERSION_STATUS   ""
++#define CV_VERSION_STATUS   "-dev"
  
  #define CVAUX_STR_EXP(__A)  #__A
  #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)