-
-
Notifications
You must be signed in to change notification settings - Fork 115
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
Merge dev fixes #1055
Closed
Closed
Merge dev fixes #1055
Conversation
This file contains 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
# Conflicts fixed: # src/Widgets/DocumentView.vala
# Conflicts fixed in: # src/FolderManager/FileView.vala # src/FolderManager/ProjectFolderItem.vala # src/MainWindow.vala
* Throttle refresh diff and control from SourceView * Match gutter/diff line to source position * Minor code style improvements
# Conflicts: # plugins/meson.build # src/Services/Document.vala
# Conflicts fixed in: # plugins/word-completion/engine.vala # plugins/word-completion/prefix-tree.vala
# Conflicts fixed in: # src/Services/Document.vala
Currently has serious memory leak and sometimes crashes - investigating. |
…into merge-dev-fixes
Outdated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A combination for dog fooding purposes of