Repository navigation
Merge upstream main f9456e8 (v0.9.1 maintenance release) - #119
Merged
Merged
Conversation
# Conflicts: # .gitignore # README.md # tools/check-source-package.py
The cd9350d sync regenerated the patch with a plain git diff, which skips untracked files, so call_frames.h, frame_stats.h, vdp1_steps.h and the new runtime tests/tools vanished and CI's host and synthetic builds failed on fork main. Regenerated as git diff c8b724d with the new files added.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges mattkuhnQAAI/sfiii-native@f9456e8 ("Prepare v0.9.1 maintenance release") into fork main.
Upstream change is docs/packaging only: release notes
docs/release-v0.9.1.md, version bumps indesktop/*dependencies.json, DESKTOP/POSIX/README download links, and the PR review doc. No runtime, native or runtime-diagnostics.patch changes, so no relink is needed.Conflicts resolved:
.gitignore: addeddocs/release-v0.9.1.mdalongside the fork's doc allowlist.tools/check-source-package.py: kept the fork's doc allowlist and addeddocs/release-v0.9.1.md.README.md: kept the fork's README structure; added a v0.9.1 summary, pointed upstream download links at v0.9.1 (graphics builder stays on v0.9.0, as upstream says), and updated the registered-profile count to 13.