Resolve all conflicts in mudlet.{cpp,h} [ci skip]#449
Merged
SlySven merged 1 commit intoMudlet:development_merge_30from Mar 27, 2017
Merged
Resolve all conflicts in mudlet.{cpp,h} [ci skip]#449SlySven merged 1 commit intoMudlet:development_merge_30from
SlySven merged 1 commit intoMudlet:development_merge_30from
Conversation
QString const plus keeping AC's memory leak fixes.
SlySven
reviewed
Mar 28, 2017
Member
There was a problem hiding this comment.
🪲 Uh, oh, I can't see how this slipped in to the header file:
signals:
void signal_editorTextOptionsChanged( QTextOption::Flags );
void signal_profileMapReloadRequested( QList<QString> );
signals:
void signal_editorTextOptionsChanged( QTextOption::Flags );
void signal_profileMapReloadRequested( QList<QString> );
but it is broken.
mehulmathur16
pushed a commit
to mehulmathur16/Mudlet
that referenced
this pull request
Feb 16, 2024
Co-authored-by: Mischa Alff <mischa@mutate.se>
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.
QString const plus keeping AC's memory leak fixes.