Skip to content

Sync main back into develop (1f84b6b3) - #143

Merged
its-janghoon merged 3 commits into
developfrom
sync/back-merge-1f84b6b3
Oct 20, 2026
Merged

its-janghoon merged 3 commits into
developfrom
sync/back-merge-1f84b6b3

Conversation

@github-actions

Copy link
Copy Markdown

main is ahead of develop; this merges it back so a branch cut from develop carries the release and hotfix commits.

Opened by the shared gitflow workflow. Merge with a merge commit (not squash), so main becomes contained in develop.

its-janghoon and others added 3 commits October 20, 2026 09:24
REDROB_VERSION, the Linux installer version file and the CHANGELOG section for 0.5.0:
2026 app icon (@redrob-labs/ui 1.8.0), the upstream-name sweep, the Windows
redrob-browser:// launch scheme.
plaster.py generate rebuilds a patch from pristine + its rules alone, so
regenerating chrome/BUILD.gn and chrome/app/settings_strings.grdp in #138
threw away the hand-written hunks those patches carried: the browseros
deps and defines in chrome/BUILD.gn, and IDS_SETTINGS_IMPORT_EXTENSIONS_CHECKBOX
/ IDS_SETTINGS_IMPORT_COOKIES_CHECKBOX, which settings_localized_strings_provider.cc
still uses, so the release build failed to compile.

Each patch is now the pre-#138 patch with only the rules #138 added applied on
top; every line of #138's version is still in it.
@its-janghoon
its-janghoon merged commit 7cd99dd into develop Oct 20, 2026
7 of 8 checks passed

This branch was successfully deployed

1 active deployment
release — 1f84b6b3 Deployed Oct 20, 2026 by its-janghoon via publish / Publish GitHub release #24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant