aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-09-24Merge "Merge remote-tracking branch 'aosp/upstream-master' into 3.18.0" into ...emu-31-stable-releaseemu-31-releaseTreehugger Robot
2021-09-24Merge remote-tracking branch 'aosp/upstream-master' into 3.18.0Erwin Jansen
2021-09-23Add two new generation options around objc prefix usage.Thomas Van Lenten
2021-09-22Add python-requires in setup.py (#8989)AN Long
2021-09-22Fix cmake install for protoc component (#8994)johanmoe
2021-09-22Update port_def.inc (#8993)Eddie-cz
2021-09-22Fix typo in Descriptor docstring (#9001)Vasily Fomin
2021-09-22deps: add j2objc annotations (#9005)Elliotte Rusty Harold
2021-09-21Merge pull request #9002 from elharo/elharo-patch-1Elliotte Rusty Harold
2021-09-20Protobuf: Fix for C5041 for VC++ >= 15.5 (#8979)Jason Erb
2021-09-20Fix unused variable warnings outside of compiler directory (#8945)Sil3ntStorm
2021-09-20Adding an extension number for protoc-gen-jsonschema (#8999)Prawn
2021-09-20docs: 3.18.0 is releasedElliotte Rusty Harold
2021-09-15Merge pull request #8912 from protocolbuffers/elharo-patch-3Elliotte Rusty Harold
2021-09-14Merge pull request #8968 from zhangskz/sync-stagezhangskz
2021-09-13Merge branch 'master' into sync-stagezhangskz
2021-09-13Fix map_test.proto package nameSandy Zhang
2021-09-13enforce android API level 14 (#8971)Elliotte Rusty Harold
2021-09-13Disable MSVC warning C4125 (decimal digit terminates octal escape sequence) (...Sil3ntStorm
2021-09-13Fix warning about unary minus operator (#8929)Sil3ntStorm
2021-09-13Fix shadowing warnings (#8926)Sil3ntStorm
2021-09-13Clean up unused code in src\google\protobuf\compiler\cpp\cpp_helpers.h (#8819)junzeng
2021-09-13Update release notes.Sandy Zhang
2021-09-13Merge tag 'refs/tags/sync-piper' into sync-stageSandy Zhang
2021-09-13Sync from Piper @396393195Sandy Zhang
2021-09-10Tweak update_file_lists.sh to handle changes to Makefile.am. (#8965)David L. Jones
2021-09-11Remove duplicate build_ext class and get_ext_filename methodSandy Zhang
2021-09-10Add release notes.Sandy Zhang
2021-09-10Merge tag 'refs/tags/sync-piper' into sync-stageSandy Zhang
2021-09-10Sync from Piper @395989630Sandy Zhang
2021-09-10Merge pull request #8966 from jtattermusch/reintroduce_setuppy_aarch64Joshua Haberman
2021-09-10Merge pull request #8959 from VeryStrongFingers/patch-1Joshua Haberman
2021-09-10Reintroduce setup.py changes from #8280 erased by piper import #8902Jan Tattermusch
2021-09-10Update field_presence.mdMitchell Macpherson
2021-09-09Merge pull request #8960 from haberman/sync-stageJoshua Haberman
2021-09-09Removed remaining dependence on six for Python.Joshua Haberman
2021-09-09Removed extraneous trailing backslashes.Joshua Haberman
2021-09-09Removed more testing of Python <3.5.Joshua Haberman
2021-09-09Disabled build_files_updated unittest for now.Joshua Haberman
2021-09-09Marked JS conformance runner as executable.Joshua Haberman
2021-09-09Removed redundant license header that confounded shebang line.Joshua Haberman
2021-09-09Removed google-internal annotation.Joshua Haberman
2021-09-09Reverted package change in test proto.Joshua Haberman
2021-09-09Added missing source to Makefile.am.Joshua Haberman
2021-09-09Added release notes.Joshua Haberman
2021-09-09Merge tag 'refs/tags/sync-piper' into sync-stageJoshua Haberman
2021-09-09Sync from Piper @395706834Joshua Haberman
2021-09-09Update Field Presence docMitchell Macpherson
2021-09-03Use ReadVarint32 for Int32 types (#8769)Kevin Gibson
2021-09-03OSS benchmark script improvements: use java 11, remove tcmalloc, remove JS (#...Jan Tattermusch