Skip to content

Commit b4d7d6b

Browse files
committed
chore: Update flame_3d CHANGELOG.md to match main + changes [flame_3d] (#3380)
Update flame_3d CHANGELOG.md to match main + changes. This is the second step in merging flame_3d into main. Before we do a final rebase of main back, the last "conflict" is the changelog file (as can be seen [on the temporary PR diff](#3377)). In order to solve this conflict, this does the following steps: * Collect the changes from flame_3d compared to the current base branch version of main (i.e.: everything that was added to the changelog; this turns out to be two entries for the same day, `2024-09-16`). * Replace the CHANGELOG.md file with the latest from current main * Add back the missing entries, but I have doctored the days to be today (`2024-12-10`), in order to not "alter the past". I am happy with keeping the original date, though. No strong preference either way. Once this is merged, the diff PR should show no conflict, and we should be able to finally rebase it with current main to get rid of all the extraneous files. Finally, we can create a new merge PR and the diff should be exactly what we want.
1 parent b8f68c3 commit b4d7d6b

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

CHANGELOG.md

-22
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,6 @@ Packages with other changes:
3131

3232
---
3333

34-
Packages with breaking changes:
35-
36-
- There are no breaking changes in this release.
37-
38-
Packages with other changes:
39-
40-
- [`flame_3d` - `v0.1.0-dev.3`](#flame_3d---v010-dev3)
41-
42-
---
43-
44-
#### `flame_3d` - `v0.1.0-dev.3`
45-
46-
- **FIX**: Improve behavior of Quaternion.slerp function [flame_3d] ([#3306](https://github.com/flame-engine/flame/issues/3306)). ([b9d6a0f1](https://github.com/flame-engine/flame/commit/b9d6a0f1d34e009cd91ae9d2ab0eed09b546d110))
47-
- **DOCS**: Update README.md docs to reflect current state of affairs ([#3305](https://github.com/flame-engine/flame/issues/3305)). ([be72daee](https://github.com/flame-engine/flame/commit/be72daee6b92bcef2af3af78c1f64abe94c49d18))
48-
49-
50-
## 2024-09-16
51-
52-
### Changes
53-
54-
---
55-
5634
Packages with breaking changes:
5735

5836
- There are no breaking changes in this release.

0 commit comments

Comments
 (0)