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.

Sign up for GitHub

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

Jump to bottom

retrodays+ floor update #36743

Closed
wants to merge 3 commits into from
Closed

retrodays+ floor update #36743

wants to merge 3 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Jan 6, 2020

Summary

SUMMARY: interface "more update for retrodays+"

Purpose of change

new floors

@ghost ghost changed the title floor update retrodays+ floor update Jan 6, 2020
@ZhilkinSerg ZhilkinSerg added the SDL: Tiles / Sound Tiles visual interface and sounds. label Jan 6, 2020
@ZhilkinSerg
Copy link
Contributor

Needs conflict resolution.

@ghost
Copy link
Author

ghost commented Jan 7, 2020

Needs conflict resolution.

i don't understand, what should i do ?
there is only one binary file that is replaced by the new one.
could you tell me ?

@ghost ghost closed this Jan 7, 2020
@weekly-digest weekly-digest bot mentioned this pull request Jan 12, 2020
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZhilkinSerg @captnblood