aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.pb.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate internal changes to github.Bo Yang2016-12-191-655/+868
* Add a swift_prefix file option.Thomas Van Lenten2016-11-301-116/+232
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-221-147/+147
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-3637/+2826
* Fix Visual Studio compile issues.Feng Xiao2016-10-101-108/+183
* Fix default instance destructorJisi Liu2016-10-101-9/+50
* Add back removed descriptor field.Bo Yang2016-10-101-103/+164
* Integrate internal changesBo Yang2016-10-101-1489/+1627
* Silence compile warnings in bazelAndy Hochhaus2016-10-091-8/+16
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-0/+25
|\
| * Fix #2032 unused parameter 'deterministic'Khing2016-09-081-0/+25
* | Fix #1955 clang-tidy warning misc-macro-parenthesesChih-Hung Hsieh2016-09-021-9/+9
|/
* Update generated files.Feng Xiao2016-07-131-63/+156
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-221/+640
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+72
|\
* | Down integrate from Google internal.Jisi Liu2016-04-281-24/+256
|/
* Integrate google internal changes.Jisi Liu2016-03-301-120/+58
* Integrate from google internal.Jisi Liu2016-01-291-54/+915
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+1
* Use angle bracket for well known type proto header.Bo Yang2015-12-081-1/+1
* Get VS 2015 to use const int definitionsBruce Dawson2015-10-291-54/+54
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-2/+3
|\
| * Specify csharp_namespace in descriptor.protoJon Skeet2015-09-011-2/+2
* | Down-integrate from google internal.Jisi Liu2015-10-051-101/+215
|/
* Update descriptor protos.Jisi Liu2015-08-251-12/+12
* Down-integrate from google3.Feng Xiao2015-08-221-241/+241
* Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-041-3/+2
|\
| * Changing reflection namespace (part 3)Jon Skeet2015-07-141-2/+2
| * Regenerated descriptor C++ codeJon Skeet2015-06-251-3/+2
* | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-291-54/+116
|/
* Give descriptor.proto a go packageTamir Duberstein2015-06-121-3/+4
* Marked another compiler literal unsigned.Austin Schuh2015-06-051-17/+17
* down-integrate internal changesBo Yang2015-05-211-584/+1279
* Marked compiler literal unsigned.Austin Schuh2015-05-191-14/+14
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-3/+3
|\
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-2/+2
* | Regenerate descriptor.pb.cc after csharp_namespace changeJon Skeet2015-05-071-2/+3
* | temporarily removing csharp_umbrella_namespace file optionJan Tattermusch2015-04-171-155/+45
* | removing csharp_property_name field optionJan Tattermusch2015-04-171-146/+34
* | fixing field number of csharp_umbrella_namespace optionJan Tattermusch2015-04-161-11/+11
* | restricted number of csharp options and regenerated descriptor.protoJan Tattermusch2015-04-131-856/+165
* | Rewrote C# protogen to C++ (initial version)Jan Tattermusch2015-03-261-46/+1070
|/
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-110/+3717
* Down-integrate from internal code base.Feng Xiao2014-11-261-21/+42
* Down-integrate from internal code base.Feng Xiao2014-11-201-60/+150
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-997/+454
* Down-integrate from internal code base.Feng Xiao2014-11-101-860/+1630
* down integrate to svnjieluo@google.com2014-07-181-807/+1796
* Replace kEmptyString wth OnceInit initialized string*xiaofeng@google.com2014-02-131-69/+69
* Add java options to plugin proto and rollback the r450liujisi@google.com2012-12-051-40/+0