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

Unificate several files with those from release 1.8 branch #6964

Merged
merged 1 commit into from Nov 5, 2018
Merged

Unificate several files with those from release 1.8 branch #6964

merged 1 commit into from Nov 5, 2018

Conversation

Greg-21
Copy link
Contributor

@Greg-21 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
Copy link
Member

LordAro commented Nov 5, 2018

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

...with those from release 1.8 branch.
@Greg-21
Copy link
Contributor Author

Greg-21 commented Nov 5, 2018

I brought back the previous title game.

@planetmaker planetmaker merged commit 4ba73da into OpenTTD:master Nov 5, 2018
@Greg-21 Greg-21 deleted the docs-unification branch November 5, 2018 23:54
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.

None yet

3 participants