Skip to content

Rebase on upstream e541a90e#67

Merged
apoelstra merged 0 commit intosecp256k1-zkpfrom
2019-05-rebase
May 30, 2019
Merged

Rebase on upstream e541a90e#67
apoelstra merged 0 commit intosecp256k1-zkpfrom
2019-05-rebase

Conversation

@apoelstra
Copy link
Copy Markdown
Contributor

PR'ing to run CI and to get an ack from @real-or-random who did this rebase in parallel (in about ten stages), confirming at each stage that our diffs were identical.

@real-or-random
Copy link
Copy Markdown
Member

ACK 6f3b0c0

@apoelstra
Copy link
Copy Markdown
Contributor Author

Thanks! Closing and will force-push this to secp256k1-zkp. All open PRs (which except #47 are only mine and Jonas') will need to be rebased.

@apoelstra apoelstra merged commit 6f3b0c0 into secp256k1-zkp May 30, 2019
@real-or-random real-or-random deleted the 2019-05-rebase branch March 30, 2026 11:11
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.

2 participants