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

Use new filename for README file. #6738

Merged
merged 1 commit into from Apr 21, 2018

Conversation

Projects
None yet
3 participants
@felicianotech
Contributor

felicianotech commented Apr 19, 2018

With the work started in #6718, the filename of the readme has changed from readme.txt to README.md.

The change to Makefile.bundle.in allows make to complete successfully.

The rest are just string changes for correctness.

@TrueBrain

This comment has been minimized.

Member

TrueBrain commented Apr 19, 2018

Awesome work there, thank you!

Would you mind changing the commit message accoring to our coding style? (https://github.com/OpenTTD/OpenTTD/blob/master/CONTRIBUTING.md#pull-requests, point 4). Otherwise it won't pass our CI :)

Easiest is to do git commit --amend, change the message, after which you have to force (-f) push your branch again. Tnx!

@felicianotech felicianotech force-pushed the felicianotech:readme-filename branch from 00d916f to a081db9 Apr 21, 2018

@felicianotech

This comment has been minimized.

Contributor

felicianotech commented Apr 21, 2018

Okay looks like I did it right. I missed that detail, thanks.

@TrueBrain TrueBrain merged commit e8de33a into OpenTTD:master Apr 21, 2018

5 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
@TrueBrain

This comment has been minimized.

Member

TrueBrain commented Apr 21, 2018

Thank you very much!

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