From f9368a102e70fe20a52b7873df17cf722bcd6ee8 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 27 Sep 2021 19:56:59 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8E=88=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d56d79..a3d1bc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ set (PROJECT_MINOR_VERSION 3) set (PROJECT_PATCH_VERSION 0) set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}) -set (PROJECT_VERSION_FULL ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}~pre1) +set (PROJECT_VERSION_FULL ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}) message (STATUS "${PROJECT_NAME} version ${PROJECT_VERSION_FULL}") diff --git a/Changelog.md b/Changelog.md index d9a4d96..1aad176 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ ## Ignition Tools 1.x -## Ignition Tools 1.3.0 (2021-09-XX) +## Ignition Tools 1.3.0 (2021-09-27) 1. Remove all death CMake code related to test. * [Pull request #54](https://github.com/ignitionrobotics/ign-tools/pull/54) From 662751501d08b797abb4f8c7f4f152155f4a3fdb Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 27 Sep 2021 20:31:29 -0700 Subject: [PATCH 2/2] merge changelog entries PR #56 fixed a bug in #55 so merge their entries Signed-off-by: Steve Peters --- Changelog.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1aad176..00cbc29 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,13 +10,11 @@ 1. Remove unused cmake code related to compilations (CFlags, BUILD_TYPE, etc.) * [Pull request #55](https://github.com/ignitionrobotics/ign-tools/pull/55) + * [Pull request #56](https://github.com/ignitionrobotics/ign-tools/pull/56) 1. Add Windows support * [Pull request #57](https://github.com/ignitionrobotics/ign-tools/pull/57) -1. Install ign command - * [Pull request #56](https://github.com/ignitionrobotics/ign-tools/pull/56) - 1. Sort versions correctly. * [Pull request #50](https://github.com/ignitionrobotics/ign-tools/pull/50)