From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Sun, 5 Jun 2022 15:16:54 +0000 (+0000)
Subject: Merge tag '3.4.18'
X-Git-Tag: accepted/tizen/unified/20230127.161057~1^2~6^2~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c103b63fe1f795c18f33181e76d146f7cc1e2eec;p=platform%2Fupstream%2Fopencv.git

Merge tag '3.4.18'
---

c103b63fe1f795c18f33181e76d146f7cc1e2eec
diff --cc modules/core/include/opencv2/core/version.hpp
index 4c08d4e3cb,4aa50024b0..9bfa15e538
--- 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    3
  #define CV_VERSION_MINOR    4
  #define CV_VERSION_REVISION 18
- #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)