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

Unificate several files with those from release 1.8 branch #6964

Merged
merged 1 commit into from Nov 5, 2018

Conversation

Projects
None yet
3 participants
@Greg-21
Contributor

Greg-21 commented Nov 5, 2018

In this commit, based on the differences between two branches: master & release 1.8, I made the same changes that was made in release 1.8 branch.

@LordAro

This comment has been minimized.

Member

LordAro commented Nov 5, 2018

The trunk/master title game is never changed, that should be reverted

Doc: Changed several files to unificate them...
...with those from release 1.8 branch.
@Greg-21

This comment has been minimized.

Contributor

Greg-21 commented Nov 5, 2018

I brought back the previous title game.

@LordAro

LordAro approved these changes Nov 5, 2018

@planetmaker planetmaker merged commit 4ba73da into OpenTTD:master Nov 5, 2018

6 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
openttd/commit-checker The commit looks good
Details
openttd/linux-amd64-clang-3.8 The commit looks good
Details
openttd/linux-amd64-gcc-6 The commit looks good
Details
openttd/linux-i386-gcc-6 The commit looks good
Details
openttd/osx-10.9 The commit looks good
Details

@Greg-21 Greg-21 deleted the Greg-21:docs-unification branch Nov 5, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment