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.1 #7487

Merged
merged 9 commits into from Apr 8, 2019
Merged

Backport marked PRs to 1.9.1 #7487

merged 9 commits into from Apr 8, 2019

Conversation

@PeterN
Copy link
Member

PeterN commented Apr 8, 2019

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

#7435
#7449
#7465
#7482
#7419
#7460
#7478

Also includes AI/GS changelog update and backported language updates.

@TrueBrain

This comment has been minimized.

Copy link
Member

TrueBrain commented Apr 8, 2019

Because I will forget: we also need to remove two lines in ai_changelog.hpp and game_changelog.hpp about 1.9 not being final (in terms of API).

@TrueBrain

This comment has been minimized.

Copy link
Member

TrueBrain commented Apr 8, 2019

Added language backports and the changelog fix; sorry, it went to the wrong branch, hope you don't mind :)

@PeterN PeterN merged commit 120d76c into OpenTTD:release/1.9 Apr 8, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190408.11 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
@PeterN PeterN deleted the PeterN:backport_1.9.1 branch Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.