Merge branch 'Release/v1.2.6' into 'main'

update document for release-v1.2.6 See merge request syntron/support/csr/ifm3d/ifm3d!287
ifm · Apr 5, 2023 · 0ecd491 · 0ecd491
2 parents b142d33 + 1294064
commit 0ecd491
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,15 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## 1.2.6 - 2023-04-05
 ### Fixes
 - Fix state of the FrameGrabber not being reset correctly after Stop() causing receive failures on subsequent Start()s
 
-## 1.2.7 - 2023-04-05
 ### Added
 - Generate and distribute stubs with python wheel package
-
-## 1.2.6 - 2023-04-05
-### Added
 - Add MAC address in ifm3d discover command output
 
 ## 1.2.5 - 2023-04-03

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.2.5*v1.2.5*1*2*5
+v1.2.6*v1.2.6*1*2*6