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

[Small] Meta file cleanup #1622

Merged
merged 1 commit into from
Nov 10, 2016
Merged

[Small] Meta file cleanup #1622

merged 1 commit into from
Nov 10, 2016

Conversation

koosemose
Copy link
Collaborator

Fixes meta files with merge conflict results (HEAD) that were merged with #1580, along with removing the meta file for the old location of fmod64.dll which was recreated in #1614

@koosemose
Copy link
Collaborator Author

Self Merging, as it only changes meta files.

@koosemose koosemose merged commit 93cba82 into TeamPorcupine:master Nov 10, 2016
@koosemose koosemose deleted the Meta-file-cleanup branch November 17, 2016 00:49
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.

1 participant