aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal
Commit message (Expand)AuthorAge
* Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\
* \ Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \
| | * Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
| | * Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
| |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
* | Use per-type table to lookup JSON name.Gravatar Feng Xiao2017-03-09
|/
* Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * Add LL to large constantGravatar zhsyourai2016-11-18
| * Made helper code also consider package name 'proto2' when dealing with Messag...Gravatar guptasu2016-11-10
|/
* Fix MSVC stack overflow issue.Gravatar Feng Xiao2016-10-10
* Fix VS test failures.Gravatar Feng Xiao2016-10-10
* Reduce test length to avoid stack overflow on VS.Gravatar Feng Xiao2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fixes static analyzer issues from xcode.Gravatar Sergio Campama2016-09-20
* fix #1342 cause by ownership issuesGravatar mike070262016-09-01
* Restore New*Callback into google::protobuf namespace since these are used by ...Gravatar Srivats P2016-08-29
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Merge pull request #1753 from xfxyjwf/fixupGravatar Jisi Liu2016-07-07
|\
| * Fix data member declaration order.Gravatar Feng Xiao2016-07-06
* | Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
|/
* Merge pull request #1704 from lizan/json_parse_optionsGravatar Feng Xiao2016-07-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| * Add JsonParseOptions to ignore unknown fieldsGravatar Lizan Zhou2016-06-28
|/
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
* Fix for Visual Studio 2008.Gravatar Feng Xiao2015-12-30
* Add missing files to EXTRA_DIST.Gravatar Feng Xiao2015-12-28
* Make conformance tests build for C++ and Java.Gravatar Feng Xiao2015-12-16
* Remove the usage of C++11 override.Gravatar Feng Xiao2015-12-14
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* Fix compilation errors when built internally.Gravatar Feng Xiao2015-11-02
* Correct spellingGravatar Benjamin Barenblat2015-10-30
* Merge pull request #815 from TeBoring/third-partyGravatar Paul Yang2015-10-09
|\
* | Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
| * Down-integrate internal bug fixing changes.Gravatar Bo Yang2015-10-04
|/
* Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-26
|\
* | fix "memory leaks" in protostream-object files.Gravatar Jisi Liu2015-08-25
* | Merge pull request #734 from TeBoring/beta-1Gravatar Feng Xiao2015-08-25
|\ \
| * | Fix bugs on windowsGravatar Bo Yang2015-08-25
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\| |
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Gravatar Jisi Liu2015-08-25
|\ \ \
| | * | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| |/ / |/| |
* | | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| | * Fix map fields parsing.Gravatar Feng Xiao2015-08-11
| |/ |/|
| * Fix gcc C++11 buildGravatar Nobuaki Sukegawa2015-08-01
|/