aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.proto
Commit message (Expand)AuthorAgeFilesLines
* 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
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-1/+21
* Submit recent changes from internal branch, including "lite mode" forkenton@google.com2009-07-291-2/+9
* Integrate recent changes from Google-internal code tree. See CHANGES.txtkenton@google.com2009-04-251-1/+8
* Push out changes from internal codebase.kenton@google.com2009-01-221-0/+6
* Integrate changes from internal code.kenton@google.com2008-11-211-0/+1
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-11/+111
* Integrate recent changes from google3.temporal2008-08-131-0/+6
* Initial checkin.temporal2008-07-101-0/+286
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-26 04:27:30 +0000