merged in default ENGINE-633
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 13 Jul 2020 11:51:22 +0200
branchENGINE-633
changeset 4848e58bce005c91
parent 4845 5feb6ee6b3e8
parent 4847 40646587d542
child 4849 c49e137cab74
merged in default
src/pEpEngine.h
     1.1 --- a/release_rc.py	Mon Jul 13 11:44:38 2020 +0200
     1.2 +++ b/release_rc.py	Mon Jul 13 11:51:22 2020 +0200
     1.3 @@ -198,7 +198,7 @@
     1.4  #define PEP_ENGINE_VERSION "2.1.0"
     1.5  version_str = str(major) + "." + str(minor) + "." + str(patch)
     1.6  
     1.7 -filedata = filedata.replace(grep_output, "#define PEP_ENGINE_VERSION \"" + version_str + "\"")
     1.8 +filedata = filedata.replace(grep_output, "#define PEP_ENGINE_VERSION \"" + version_str + "\"\n")
     1.9  filedata = filedata.replace(grep_strs[0], "#define PEP_ENGINE_VERSION_MAJOR " + str(major))
    1.10  filedata = filedata.replace(grep_strs[1], "#define PEP_ENGINE_VERSION_MINOR " + str(minor))
    1.11  filedata = filedata.replace(grep_strs[2], "#define PEP_ENGINE_VERSION_PATCH " + str(patch))
     2.1 --- a/src/pEpEngine.h	Mon Jul 13 11:44:38 2020 +0200
     2.2 +++ b/src/pEpEngine.h	Mon Jul 13 11:51:22 2020 +0200
     2.3 @@ -21,7 +21,8 @@
     2.4  
     2.5  // RELEASE version this targets
     2.6  // (string: major.minor.patch)
     2.7 -#define PEP_ENGINE_VERSION "2.1.0"#define PEP_ENGINE_VERSION_MAJOR 2
     2.8 +#define PEP_ENGINE_VERSION "2.1.0"
     2.9 +#define PEP_ENGINE_VERSION_MAJOR 2
    2.10  #define PEP_ENGINE_VERSION_MINOR 1
    2.11  #define PEP_ENGINE_VERSION_PATCH 0
    2.12  #define PEP_ENGINE_VERSION_RC    16