Skip to content
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

Integrate from Piper for C++, Java, and Python #10254

Merged
merged 5 commits into from
Jul 14, 2022

Conversation

haberman
Copy link
Member

Important: this integration must be merged, not squashed!

@@ -0,0 +1,62 @@
#!/bin/bash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think something went wrong with the merge here because in #10243, this file was recently deleted and cmake/update_file_lists.sh was added.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@haberman haberman merged commit a972626 into protocolbuffers:main Jul 14, 2022
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
Integrate from Piper for C++, Java, and Python
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.

3 participants