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

OpenXCOM: Icon update #2561

Closed
wants to merge 1 commit into from
Closed

OpenXCOM: Icon update #2561

wants to merge 1 commit into from

Conversation

BeOSRefugee
Copy link

Added the new icon from more recent builds.

Added the new icon from more recent builds.
@extrowerk extrowerk changed the title Icon update OpenXCOM: Icon update May 17, 2018
@extrowerk
Copy link
Member

You want to bump the revision to get it rebuilt after the merge.

$"C622BA3BC60BB911C607B911C607B911C58CBAFBC1BFBB7FC41EBBCBC240B99A"
$"C607B911C3ADB8CAC607B911050A000100000A0101011001178122040A000202"
$"03000A01020405000A010106100117812204"
$"6E636966020369C7B905000C0604CBCEA1B9B2CDBAB82ACEA1B9B2D505B310CD"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, in line 19 we have 7 spaces (instead of one tab.)

Are you comfortable with git? If not, I can update your PR with this tiny "fix" and the REVISION bump.

Hmm, I just noticed that your changes are in your master branch.
That's not recommended because it makes it harder for you to update your master branch with new commits from the project's master branch, should you wish to update your master branch before the merge.
But don't worry, you can continue with this PR, and we will also be able to merge it too, with no extra work.

(Once this PR is merged, you will need to update your local master branch and then git push --force your local master to your remote master (on GitHub) to re-sync your GitHub's master branch with the projects master. BTW, in case you need help for that, please do not hesitate to ask.)

For your next PRs, you should use feature-branches.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix it and submit from a feature branch. Part of doing this is getting some familiarity with GitHub, so it's worth me figuring out how to do it right.

@BeOSRefugee
Copy link
Author

Do I need to change the revision in the recipe file as well as the rdef file? It's literally just updating the icon. I assume that would be a "minor" revision, as in:

resource app_version { major = 1, middle = 0, minor = 1,

@extrowerk
Copy link
Member

@BeOSRefugee : just in the recipe

jessicah added a commit that referenced this pull request Jul 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants