aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal
Commit message (Expand)AuthorAgeFilesLines
* Integrate from internal code base.Feng Xiao2016-07-135-23/+94
* Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-071-2/+2
|\
| * Fix data member declaration order.Feng Xiao2016-07-061-2/+2
* | Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
|/
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-015-4/+140
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-285-4/+140
* | Integrated internal changes from GoogleAdam Cozzette2016-06-2912-33/+95
|/
* Down integrate from Google internal.Jisi Liu2016-04-287-30/+369
* Do not use C++11 unicode escape in unittest.Jisi Liu2016-04-011-1/+1
* Integrate google internal changes.Jisi Liu2016-03-3023-186/+980
* Integrate from google internal.Jisi Liu2016-01-291-0/+29
* Fix for Visual Studio 2008.Feng Xiao2015-12-301-2/+6
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-282-222/+0
* Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-2/+2
* Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
* Down-integrate from internal code base.Feng Xiao2015-12-1124-1613/+2155
* Fix compilation errors when built internally.Feng Xiao2015-11-022-2/+2
* Correct spellingBenjamin Barenblat2015-10-301-1/+1
* Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-092-2/+7
|\
| * Down-integrate internal bug fixing changes.Bo Yang2015-10-042-2/+7
* | Down-integrate from google internal.Jisi Liu2015-10-059-46/+207
|/
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-261-1/+3
|\
| * Fix map fields parsing.Feng Xiao2015-08-111-1/+3
* | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
* | Merge pull request #734 from TeBoring/beta-1Feng Xiao2015-08-255-12/+17
|\ \
| * | Fix bugs on windowsBo Yang2015-08-255-12/+17
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-2526-627/+697
|\| |
| * | Down-integrate from google3.Feng Xiao2015-08-2226-628/+698
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-251-8/+3
|\ \ \ | |/ / |/| |
| * | Fix gcc C++11 buildNobuaki Sukegawa2015-08-011-8/+3
| |/
* / Down-integrate from internal branch.Jisi Liu2015-08-211-0/+68
|/
* MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-012-2/+4
* fix compiler warnings.Jisi Liu2015-06-241-0/+3
* using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
* Fix broken builds.Feng Xiao2015-06-179-61/+67
* Down-integrate from internal code base.Feng Xiao2015-06-1549-0/+13520