summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authormtgmonkey <mtgmonkey@nixos>2025-12-08 21:33:13 +0100
committermtgmonkey <mtgmonkey@nixos>2025-12-08 21:33:13 +0100
commitffc9d08a2dc3341ee445db2b61d8c188330168ae (patch)
tree97b587783df5f7626bab52ad10812362a3b7a354 /CHANGELOG.md
parent35bd4c1740e0a8da7cf982a18f506fa2d38b150e (diff)
parentd87e4ba21a64593d2ef5878281e3ab939d483e83 (diff)
Merge branch 'development'
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a0bd3..b029d3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- use `Double` rather than `FLoat` for internal calculations
- `cursorPos`, `dt` natively `Double` already
+<<<<<<< HEAD
## [0.2.0] - 2025-12-07
+=======
+## [0.2.0-pre0] - 2025-12-07
+>>>>>>> development
### Added