aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.pb.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-109/+110
* Down-integrate proto2 namespace fix.Feng Xiao2018-08-131-27/+27
* Merge master branch.Feng Xiao2018-08-081-1/+1
|\
| * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-2/+2
* | Down-integrate from google3.Feng Xiao2018-08-081-1475/+926
|/
* Update version number to 3.6.0Jisi Liu2018-05-141-2/+2
* Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-111-37/+267
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-720/+792
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
* | Update generated code.Feng Xiao2017-12-131-3/+3
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-2/+2
|\|
| * Update generated descritpors.Jisi Liu2017-11-021-2/+2
* | Integrated internal changes from GoogleAdam Cozzette2017-12-011-364/+483
|/
* Merge from google internalJisi Liu2017-10-181-507/+683
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-585/+2468
* Update required version on pre-generated filesJisi Liu2017-07-241-1/+1
* Update pre generated filesJisi Liu2017-07-241-1/+1
* Merge master into 3.4.xJisi Liu2017-07-181-27/+142
|\
| * Support PHP generic services (#3269)Matt A2017-07-181-9/+43
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-27/+108
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-72/+698
|/
* Update generated code.Feng Xiao2017-04-051-2/+2
* Down-integrate from google3.Feng Xiao2017-03-291-212/+177
* Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-201-25/+25
|\
| * fix attributes warningMarkus Heß2017-03-151-25/+25
* | Add file option php_class_prefix (#2849)Paul Yang2017-03-171-27/+107
|/
* Expose rvalue setters for repeated string fields.Chris Kennelly2017-02-151-0/+54
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-462/+395
* Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-161-0/+319
* Regenerate descriptor protoJulien Brianceau2016-12-081-25/+25
* Add a swift_prefix file option.Thomas Van Lenten2016-11-301-27/+96
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-942/+1007
* Fix Visual Studio compile issues.Feng Xiao2016-10-101-100/+150
* Add back removed descriptor field.Bo Yang2016-10-101-30/+64
* Bump library veriosn to 3.1Bo Yang2016-10-101-2/+2
* Integrate internal changesBo Yang2016-10-101-195/+321
* Update generated files.Jisi Liu2016-09-141-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-48/+336
* Down integrate from Google internal.Jisi Liu2016-04-281-30/+99
* Integrate google internal changes.Jisi Liu2016-03-301-37/+3
* Integrate from google internal.Jisi Liu2016-01-291-6/+403
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+71
* Down-integrate from google3.Feng Xiao2015-08-221-173/+173
* Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-291-3/+37
* down-integrate internal changesBo Yang2015-05-211-10/+404
* temporarily removing csharp_umbrella_namespace file optionJan Tattermusch2015-04-171-68/+0
* removing csharp_property_name field optionJan Tattermusch2015-04-171-68/+0
* fixing field number of csharp_umbrella_namespace optionJan Tattermusch2015-04-161-3/+3
* restricted number of csharp options and regenerated descriptor.protoJan Tattermusch2015-04-131-448/+73
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 20:52:53 +0000