aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.proto
Commit message (Expand)AuthorAgeFilesLines
* Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-111-0/+11
* Merge from google internalJisi Liu2017-10-181-2/+4
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+22
* Merge master into 3.4.xJisi Liu2017-07-181-0/+6
|\
| * Support PHP generic services (#3269)Matt A2017-07-181-0/+1
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-0/+5
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-7/+19
|/
* Down-integrate from google3.Feng Xiao2017-03-291-1/+2
* Add file option php_class_prefix (#2849)Paul Yang2017-03-171-0/+4
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-1/+5
* update descriptor.proto's go_packageMichael Darakananda2016-12-071-1/+1
* Add a swift_prefix file option.Thomas Van Lenten2016-11-301-0/+6
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-3/+15
* Add back removed descriptor field.Bo Yang2016-10-101-4/+2
* Integrate internal changesBo Yang2016-10-101-16/+9
* Integrate from internal code base.Feng Xiao2016-07-131-0/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+9
* Integrate google internal changes.Jisi Liu2016-03-301-4/+2
* Integrate from google internal.Jisi Liu2016-01-291-1/+27
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-2/+1
|\
| * Specify csharp_namespace in descriptor.protoJon Skeet2015-09-011-2/+1
* | Down-integrate from google internal.Jisi Liu2015-10-051-0/+6
|/
* Down-integrate from google3.Feng Xiao2015-08-221-4/+7
* Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-041-1/+1
|\
| * Changing reflection namespace (part 3)Jon Skeet2015-07-141-1/+1
| * Merged masterJon Skeet2015-06-171-0/+1
| |\
| * | First pass at the mutable API. Quite a bit more to do - in particular, it's p...Jon Skeet2015-06-091-1/+1
* | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-291-0/+5
| |/ |/|
* | Give descriptor.proto a go packageTamir Duberstein2015-06-121-0/+1
|/
* down-integrate internal changesBo Yang2015-05-211-6/+39
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-0/+1
|\
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+1
* | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-061-0/+1
* | temporarily removing csharp_umbrella_namespace file optionJan Tattermusch2015-04-171-7/+0
* | removing csharp_property_name field optionJan Tattermusch2015-04-171-6/+0
* | one more fix to csharp_umbrella_namespace commentJan Tattermusch2015-04-171-3/+5
* | fix: do not mention umbrella_classname in commentJan Tattermusch2015-04-171-1/+1
* | Fixed comment for csharp_umbrella_namespace (nest_classes has been removed)Jan Tattermusch2015-04-161-2/+1
* | fixing field number of csharp_umbrella_namespace optionJan Tattermusch2015-04-161-1/+1
* | restricted number of csharp options and regenerated descriptor.protoJan Tattermusch2015-04-131-44/+5
* | Rewrote C# protogen to C++ (initial version)Jan Tattermusch2015-03-261-0/+52
|/
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-4/+19
* Down-integrate from internal code base.Feng Xiao2014-11-201-0/+5
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-0/+5
* Down-integrate from internal code base.Feng Xiao2014-11-101-17/+34
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-2/+2
* down integrate to svnjieluo@google.com2014-07-181-6/+73
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-8/+90
* Update comments for globally unique extension number for custom options.liujisi@google.com2011-05-251-4/+9
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-7/+107
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 17:35:05 +0000