Merge tag '4.1.2'

This commit is contained in:
Alexander Alekhin 2019-10-09 23:01:31 +00:00
commit 46206b4814

View File

@ -8,7 +8,7 @@
#define CV_VERSION_MAJOR 4 #define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 1 #define CV_VERSION_MINOR 1
#define CV_VERSION_REVISION 2 #define CV_VERSION_REVISION 2
#define CV_VERSION_STATUS "-pre" #define CV_VERSION_STATUS "-dev"
#define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A) #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)