aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Use the portable version of Log2Floor for Clang with older Android NDK versionsAdam Cozzette2017-12-071-4/+12
| |/ / / |/| | |
* | | | Merge branch 'master' into down-integrateAdam Cozzette2017-12-0135-433/+100
|\| | |
| * | | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-3031-200/+92
| |\| |
| | * | 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
| * | | Merge pull request #3955 from linux-on-ibm-z/masterFeng Xiao2017-11-301-0/+8
| |\ \ \
| | * | | Adding Release_CompareAndSwap 64-bit variantNayana-ibm2017-11-271-0/+8
| * | | | Added back in LIBPROTOC_EXPORT which was removed by mistakeAdam Cozzette2017-11-281-1/+1
| |/ / /
| * / / Move C#-only test protos to csharp/protosJon Skeet2017-11-124-233/+0
| |/ /
* / / Integrated internal changes from GoogleAdam Cozzette2017-12-01100-2750/+3514
|/ /
* | 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
| |\ \ \ \
| | * | | | Remove ranged based for in io_win32.ccJisi Liu2017-09-271-2/+2
| * | | | | Add spacesJisi Liu2017-09-271-1/+1
| * | | | | Fix C++11 string accessorsJisi Liu2017-09-271-1/+1
| |/ / / /
| * | | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| * | | | Exclude valid constant name from reserved name.Bo Yang2017-09-121-2/+35
| * | | | Add prefix to php reserved keywords.Bo Yang2017-09-081-3/+21
| |/ / /
| * / / change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-303-137/+137
| |/ /
| * | Make distcheck aware of test proto files.Jisi Liu2017-08-231-2/+8
* | | Use constexpr more with VC++ 2017 (#3707)Bruce Dawson2017-10-021-1/+2
* | | Test Shutdown can be called multiple times.Jisi Liu2017-09-211-0/+2
* | | Integrated internal changes from GoogleAdam Cozzette2017-09-14118-12977/+11217
* | | Clang warning cleanup for unused parameter.drivehappy2017-09-131-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 19:25:32 +0000