Resolve nearly all conflicts in T2DMap.cpp and T2DMap.h [ci skip]#447
Merged
SlySven merged 2 commits intoMudlet:development_merge_30from Mar 27, 2017
Merged
Resolve nearly all conflicts in T2DMap.cpp and T2DMap.h [ci skip]#447SlySven merged 2 commits intoMudlet:development_merge_30from
SlySven merged 2 commits intoMudlet:development_merge_30from
Conversation
Leaving the TEvent stuff until I can find out about which way to go. Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
vadi2
approved these changes
Mar 27, 2017
Member
vadi2
left a comment
There was a problem hiding this comment.
Just a minor fix & then you're sweet to merge
| <<<<<<< HEAD | ||
| ======= | ||
| , mDialogLock(false) | ||
| >>>>>>> SlySven/release_30 |
Member
There was a problem hiding this comment.
There's now two mDialogLock(false) calls in the constructor ;)
Signed-off-by: Stephen Lyons <slysven@virginmedia.com>
mehulmathur16
pushed a commit
to mehulmathur16/Mudlet
that referenced
this pull request
Feb 16, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Leaving the TEvent stuff until I can find out about which way to go.
Signed-off-by: Stephen Lyons slysven@virginmedia.com