Merge branch 'development'

release v0.2.0
correct licensing in source files
2025-12-08 21:33:13 +01:00 · 2025-12-08 13:33:19 +01:00 · 2025-12-08 13:12:52 +01:00 · 2025-12-08 11:21:14 +01:00 · 2025-12-08 05:57:20 +01:00
1 changed files with 4 additions and 0 deletions
--- 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
Author	SHA1	Message	Date
mtgmonkey	ffc9d08a2d	Merge branch 'development'	2025-12-08 21:33:13 +01:00
mtgmonkey	d87e4ba21a	release v0.2.0	2025-12-08 13:33:19 +01:00
mtgmonkey	9e8bafa6e2	correct licensing in source files	2025-12-08 13:12:52 +01:00
mtgmonkey	5585a49393	semantics, readability, relicense, initResource argument removal	2025-12-08 11:21:14 +01:00
mtgmonkey	e767a5ee5b	semantics: change from Game/Main.hs to Game.hs	2025-12-08 05:57:20 +01:00