diff options
author | Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> | 2024-03-27 13:24:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-27 13:24:13 -0700 |
commit | 5f1e1d72fc27927a32fbbb7937f23f25e64f1e22 (patch) | |
tree | a01e404b73853c2547855f856f35f2bd5e1f21ae /src/google/protobuf/descriptor.pb.cc | |
parent | 49253b118b40719b938c2b74a53d70f5450d87b0 (diff) | |
parent | 1256a59e7d25e21cafc8da97e91fcd31e5b11299 (diff) | |
download | protobuf-5f1e1d72fc27927a32fbbb7937f23f25e64f1e22.tar.gz |
Merge pull request #16332 from protocolbuffers/26.x-202403271956upstream-26.x
Merge release commits to 26.x
Diffstat (limited to 'src/google/protobuf/descriptor.pb.cc')
-rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index b5de9f0af..0684d7910 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,6 +1,6 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.26.1-dev +// Protobuf C++ Version: 5.26.2-dev #include "google/protobuf/descriptor.pb.h" |