diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
commit | 1390b4c5e1207f41b66c69edc66496a5f9b63b12 (patch) | |
tree | 912a03dd3477931f5d90f20be558e3afb5ef7ebe /CMakeGUDHIVersion.txt | |
parent | 458bc2dcf5044e1d5fde5326b2be35e526abd457 (diff) | |
parent | 4737aaeb36a4ff3b27d7bcbb374911197ed09e5a (diff) |
Merge master & resolve conflicts
Diffstat (limited to 'CMakeGUDHIVersion.txt')
-rw-r--r-- | CMakeGUDHIVersion.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index a78b8adc..5f1eaacf 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,8 +1,8 @@ # Must be conform to pep440 - https://www.python.org/dev/peps/pep-0440/#pre-releases set (GUDHI_MAJOR_VERSION 3) -set (GUDHI_MINOR_VERSION 3) +set (GUDHI_MINOR_VERSION 4) # GUDHI_PATCH_VERSION can be 'ZaN' for Alpha release, 'ZbN' for Beta release, 'ZrcN' for release candidate or 'Z' for a final release. -set (GUDHI_PATCH_VERSION 0rc1) +set (GUDHI_PATCH_VERSION 0a0) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") |