Skip to content

Sync mudlet-lua to 9f9248fdb2900f695cb6df7a99bbcbd2135dab55#415

Merged
vadi2 merged 1 commit intoMudlet:release_30from
vadi2:(release_30)-sync-mudlet-lua
Mar 13, 2017
Merged

Sync mudlet-lua to 9f9248fdb2900f695cb6df7a99bbcbd2135dab55#415
vadi2 merged 1 commit intoMudlet:release_30from
vadi2:(release_30)-sync-mudlet-lua

Conversation

@vadi2
Copy link
Copy Markdown
Member

@vadi2 vadi2 commented Mar 9, 2017

Need another sync as a complement to #414. Has a couple of bugfixes that have happened to mudlet-lua since then.

Copy link
Copy Markdown
Member

@SlySven SlySven left a comment

Choose a reason for hiding this comment

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

I see that the first file's change fixes the typo in the other PR. 😄

Cannot offer an opinion about other two but trust they are good. 😐

@keneanung
Copy link
Copy Markdown
Member

⚠️ Careful when merging this after #414: the definition of the prefixes table will still contain the call to getMudletLuaDefaultPath which doesn't exist. Better to merge release_30 into this and overwrite LuaGlobal.cs again.

@vadi2 vadi2 merged commit bb7bdc1 into Mudlet:release_30 Mar 13, 2017
@vadi2 vadi2 deleted the (release_30)-sync-mudlet-lua branch March 13, 2017 01:02
@vadi2
Copy link
Copy Markdown
Member Author

vadi2 commented Mar 13, 2017

It didn't matter either way it seems because this PR didn't touch that particular line. Will send a follow-up PR.

@keneanung
Copy link
Copy Markdown
Member

That's why you didn't get a conflict, which was my point. We wouldn't have noticed the erroneous LuaGlobal until later.

@vadi2
Copy link
Copy Markdown
Member Author

vadi2 commented Mar 13, 2017

Makes sense, thanks for the heads up on that.

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.

3 participants