From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Sun, 18 Nov 2018 09:21:45 +0000 (+0000)
Subject: Merge tag '4.0.0'
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59e2ca16d9567dba3bc3ddc318f21dcaae98dc6b;p=platform%2Fupstream%2Fopencv.git

Merge tag '4.0.0'

OpenCV 4.0.0
---

59e2ca16d9567dba3bc3ddc318f21dcaae98dc6b
diff --cc modules/core/include/opencv2/core/version.hpp
index 73d61a5,3902601..2a4b615
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@@ -8,7 -8,7 +8,7 @@@
  #define CV_VERSION_MAJOR    4
  #define CV_VERSION_MINOR    0
  #define CV_VERSION_REVISION 0
- #define CV_VERSION_STATUS   "-pre"
 -#define CV_VERSION_STATUS   ""
++#define CV_VERSION_STATUS   "-dev"
  
  #define CVAUX_STR_EXP(__A)  #__A
  #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)