*: Upstream changes from proglottis/gpgme#2
Closed
wking wants to merge 4 commits into
Closed
Conversation
Generated with: $ git remote add proglottis git://github.com/proglottis/gpgme.git $ git fetch proglottis $ git remote add mtrmac git://github.com/mtrmac/gpgme.git $ git fetch mtrmac $ git checkout -b upstream-changes proglottis/master $ git merge --log mtrmac/master $ emacs gpgme.go # mostly keep proglottis, but keep mtrmac's 'Unavailable in 1.3.2' comments $ git add gpgme.go $ git commit * mtrmac/master: Comment out a few constants to make this build with gpgme 1.3.2 Comment out a few constants to make this build with gpgme 1.4.3
Author
Owner
|
Yes, something like this should eventually happen (or maybe I should just rebase the branches), but not right now please; I’m in the middle of (as time permits) debugging those crashes you’ve seen as well, and a moving target would not help. I have reviewed those commits some time ago, and nothing in them matters to the c/image use AFAICT. |
Owner
|
This repo was just updated to fix proglottis#23 (finally fixing the crashes, thanks to Ulrich Obergfell, which brings it up to date with 0.1.1. |
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.
Pulling in upstrem improvements. Generated with: