aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util
Commit message (Expand)AuthorAgeFilesLines
* Integrate google internal changes.Jisi Liu2016-03-3031-228/+1284
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-031-1/+1
* Integrate from google internal.Jisi Liu2016-01-291-0/+29
* Fix for Visual Studio 2008.Feng Xiao2015-12-302-11/+20
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-283-227/+6
* 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-1132-1624/+2277
* Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
* Correct spellingBenjamin Barenblat2015-10-301-1/+1
* Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-093-5/+12
|\
| * Down-integrate internal bug fixing changes.Bo Yang2015-10-043-5/+12
* | Use static castHamdi Sahloul2015-10-091-1/+1
* | VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
* | Remove duplicated header fileJisi Liu2015-10-061-218/+0
* | Down-integrate from google internal.Jisi Liu2015-10-0519-130/+537
|/
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-262-1/+14
|\
| * Fix map fields parsing.Feng Xiao2015-08-112-1/+14
* | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
* | Merge pull request #734 from TeBoring/beta-1Feng Xiao2015-08-258-26/+40
|\ \
| * | Fix bugs on windowsBo Yang2015-08-258-26/+40
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-2532-655/+771
|\| |
| * | Down-integrate from google3.Feng Xiao2015-08-2232-656/+772
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-252-9/+4
|\ \ \ | |/ / |/| |
| * | Fix gcc C++11 buildNobuaki Sukegawa2015-08-012-9/+4
| |/
* / Down-integrate from internal branch.Jisi Liu2015-08-217-0/+2219
|/
* MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-012-2/+4
* fix compiler warnings.Jisi Liu2015-06-243-11/+6
* using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
* Fix broken builds.Feng Xiao2015-06-1714-86/+96
* Down-integrate from internal code base.Feng Xiao2015-06-1564-0/+21486
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-26 04:31:46 +0000