aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-141/+149
* Down-integrate from google3.Feng Xiao2018-08-081-35/+40
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-4/+5
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+74
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-32/+66
* Down-integrate from google3.Feng Xiao2017-03-291-24/+129
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-0/+1
* Integrate internal changesBo Yang2016-10-101-2/+7
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+8
* Integrate google internal changes.Jisi Liu2016-03-301-0/+26
* Fixed unused parameters and extra ';'Swen Kooij2016-01-281-5/+5
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+36
* Down-integrate from google3.Feng Xiao2015-08-221-1/+3
* down-integrate internal changesBo Yang2015-05-211-2/+65
* internal changesBo Yang2015-04-241-0/+4
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-12/+12
* Down-integrate from internal code base.Feng Xiao2014-11-201-0/+10
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-2/+2
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-111-2/+2
|\
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-081-2/+2
* | Down-integrate from internal code base.Feng Xiao2014-11-101-17/+100
|/
* Fixed Unused Parameter warning in headers.Austin Schuh2014-10-311-5/+5
* Down-integrate from internal branch.Feng Xiao2014-10-031-11/+11
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-1/+1
* down integrate to svnjieluo@google.com2014-07-181-16/+186
* Down-integrate form internal opensource branchliujisi@google.com2012-12-191-0/+4
* Remove extra semicolonsliujisi@google.com2012-12-051-7/+7
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-6/+156
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-4/+19
* Integrate recent changes from Google-internal code tree. See CHANGES.txtkenton@google.com2009-04-251-11/+86
* Push out changes from internal codebase.kenton@google.com2009-01-221-0/+50
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-39/+81
* Integrate recent changes from google3.temporal2008-08-131-3/+3
* Sync code with Google-internal branch. Changes:temporal2008-07-231-1/+13
* Initial checkin.temporal2008-07-101-0/+1173