aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/api.pb.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-18/+19
* Down-integrate proto2 namespace fix.Feng Xiao2018-08-131-3/+3
* 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-27/+44
|/
* Update version number to 3.6.0Jisi Liu2018-05-141-2/+2
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-73/+70
* 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-47/+67
|/
* Merge from google internalJisi Liu2017-10-181-20/+18
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-22/+33
* Update required version on pre-generated filesJisi Liu2017-07-241-1/+1
* Update pre generated filesJisi Liu2017-07-241-1/+1
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-21/+63
* Update generated code.Feng Xiao2017-04-051-2/+2
* Down-integrate from google3.Feng Xiao2017-03-291-18/+20
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-66/+65
* Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-161-0/+77
* Regenerate descriptor protoJulien Brianceau2016-12-081-9/+9
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-114/+131
* Fix Visual Studio compile issues.Feng Xiao2016-10-101-12/+18
* Bump library veriosn to 3.1Bo Yang2016-10-101-2/+2
* Integrate internal changesBo Yang2016-10-101-17/+34
* Update generated files.Jisi Liu2016-09-141-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-6/+18
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+8
* Use angle bracket for well known type proto header.Bo Yang2015-12-081-2/+2
* Update descriptor protos.Jisi Liu2015-08-251-28/+28
* Down-integrate from internal branch.Jisi Liu2015-08-211-1/+274
* down-integrate internal changesBo Yang2015-05-211-1/+3
* Include generated code of well-known types in protobuf C++ runtime.Feng Xiao2015-05-111-0/+701