diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2021-01-22 10:56:44 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2021-01-22 10:56:44 +0100 |
| commit | e4052a5a176ade4fbebfdd782e5f60caf080872d (patch) | |
| tree | 27430b66aa4f07f487b7eeeaaccdae5f0cb4b858 /CMakeGUDHIVersion.txt | |
| parent | acb4fe9736ebaa444fa654aacfccbb7112a9f3fe (diff) | |
| parent | 0d4d99efd1ea1c594be14baca0bab714ed172607 (diff) | |
Merge master and resolve conflicts
Diffstat (limited to 'CMakeGUDHIVersion.txt')
| -rw-r--r-- | CMakeGUDHIVersion.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 11c8766b..5b0777a6 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -2,7 +2,7 @@ set (GUDHI_MAJOR_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 1rc1) +set (GUDHI_PATCH_VERSION 1) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") |