aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* remove nullptrJisi Liu2018-01-021-1/+1
* Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
|\
| * Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
* | Merge pull request #4072 from google/jieluoJisi Liu2017-12-194-51/+99
|\ \
| * | Cherrypick for csharp, including:Jie Luo2017-12-194-51/+99
* | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| |/ |/|
* | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
|\ \
| * | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| |/
* / Update version number to 3.5.1Jisi Liu2017-12-1914-16/+16
|/
* Merge pull request #4040 from bazurbat/3.5.xAdam Cozzette2017-12-151-0/+1
|\
| * Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
* | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
|\ \
| * | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
* | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-2/+2
| |/ |/|
* | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
* | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
* | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-3/+26
* | io_win32: add more encoding-related testsLaszlo Csomor2017-12-073-31/+89
* | io_win32: support non-ASCII pathsLaszlo Csomor2017-12-073-89/+176
* | io_win32_unittest: make //:win32_test run againLaszlo Csomor2017-12-071-49/+29
|/
* Support win32 long path for cross compiled buildJisi Liu2017-11-1013-29/+22
* Merge pull request #3854 from pherl/3.5.xJisi Liu2017-11-083-130/+2
|\
| * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-083-130/+2
* | Provide util funtions to figure out correct php class names. (#3850)Paul Yang2017-11-082-9/+36
|/
* Update generated descritpors.Jisi Liu2017-11-0212-24/+24
* Update version number to 3.5.0Jisi Liu2017-11-022-8/+8
* Fix merging with message-valued oneofJon Skeet2017-10-319-3/+30
* update joda-time javadoc urlxuwei-k2017-10-301-1/+1
* Reserve unknown in Ruby (#3763)Paul Yang2017-10-261-0/+3
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-2/+5
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-181-2/+5
| |\
| | * Add @Deprecated annotation support for proto file.Jisi Liu2017-08-311-2/+5
| * | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
| |\ \
| | * | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
| | * | Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-131-29/+5
| | * | Fix js conformance tests. (#3604)Paul Yang2017-09-121-5/+29
* | | | Merge pull request #3743 from Schtolc/masterJisi Liu2017-10-191-3/+3
|\ \ \ \
| * | | | CodedInputStream::SetTotalBytesLimit description fixPavel2017-10-121-3/+3
* | | | | Merge pull request #3754 from toanju/gcc-fallthroughJisi Liu2017-10-191-0/+2
|\ \ \ \ \
| * | | | | fix implicit fallthrough in gcc 7Tobias Jungel2017-10-151-0/+2
* | | | | | Fix Java 1.6 compileJisi Liu2017-10-181-2/+2
* | | | | | Fix bazel buildJisi Liu2017-10-181-4/+2
* | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2017-10-181-13/+21
|\ \ \ \ \ \
| * | | | | | Fix unsiged underflowJisi Liu2017-10-181-1/+1
| * | | | | | Remove C++11 only usages in io_win32 tests.Jisi Liu2017-10-181-13/+21
* | | | | | | Merge from google internalJisi Liu2017-10-1875-2889/+3302
|/ / / / / /
* / / / / / Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-164-10/+16
|/ / / / /
* | | | | Move namespace closing brace inside the header guard blockFrancois Marier2017-10-121-1/+1
* | | | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-113-9/+65
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #3690 from pherl/3.4.xJisi Liu2017-10-021-2/+2
| |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 03:20:32 +0000