Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport marked PRs to 1.9 #7444

Merged
merged 2 commits into from Mar 30, 2019
Merged

Backport marked PRs to 1.9 #7444

merged 2 commits into from Mar 30, 2019

Conversation

@TrueBrain
Copy link
Member

TrueBrain commented Mar 30, 2019

This backports the PRs marked as "backport requested" that had no conflicts while cherry-picking.

#7412

Also backports current translations.

@TrueBrain TrueBrain changed the title Backport 1.9 Backport marked PRs to 1.9 Mar 30, 2019
Copy link
Contributor

andythenorth left a comment

Looks correct to me. The backported commits match what's expected.

@TrueBrain TrueBrain merged commit 1303aba into OpenTTD:release/1.9 Mar 30, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190330.5 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@TrueBrain TrueBrain deleted the TrueBrain:backport_1.9 branch Mar 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.