aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Update version number and changelog for 3.3.0Feng Xiao2017-04-052-8/+8
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
* Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
* Down-integrate from google3.Feng Xiao2017-03-29169-4793/+10531
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
* | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-204-0/+205
|\ \
| * | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| * | fix several issuesByron Yi2017-03-173-15/+15
| * | add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| * | migrate delimited messages functions to util packageByron Yi2017-03-164-0/+205
| |/
* | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-202-60/+0
|\ \
| * | Remove duplicated copyright statementprehistoric-penguin2017-03-162-60/+0
| |/
* | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \
| * | fix attributes warningMarkus Heß2017-03-153-31/+31
* | | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \
| * | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| * | | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| | |/ | |/|
* | | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ \
| * | | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
* | | | Add file option php_class_prefix (#2849)Paul Yang2017-03-174-148/+358
* | | | Merge pull request #2848 from xfxyjwf/freebsdFeng Xiao2017-03-174-0/+63
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix freebsd build.Feng Xiao2017-03-144-0/+63
| | |/ | |/|
* | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutJoshua Haberman2017-03-152-8/+18
|\ \ \
| * | | compiler/cli: PrintHelpText prints to stdout instead of stderrEmmanuel Odeke2017-03-082-8/+18
* | | | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbolsAdam Cozzette2017-03-154-0/+42
|\ \ \ \
| * | | | Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-134-0/+42
* | | | | Merge pull request #2846 from acozzette/bytestream-commentAdam Cozzette2017-03-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Updated an outdated comment in bytestream.hAdam Cozzette2017-03-141-1/+1
| |/ / /
* / / / Replace CHECK() with GOOGLE_CHECK().Josh Haberman2017-03-131-3/+4
|/ / /
* | | Merge pull request #2822 from anandolee/masterJie Luo2017-03-101-18/+73
|\ \ \ | | |/ | |/|
| * | Add auto detect for generated code of WKT protos, addressbook.proto and confo...Jie Luo2017-03-101-18/+73
* | | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-101-1/+1
|\ \ \
| * | | Fix java code according to error prone.Jisi Liu2017-03-101-1/+1
* | | | Merge pull request #2824 from xfxyjwf/i1415Feng Xiao2017-03-103-10/+45
|\ \ \ \
| * | | | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
| | |/ / | |/| |
* | | | Repeated/Map field setter should accept a regular PHP array (#2817)Paul Yang2017-03-101-1/+27
| |/ / |/| |
* | | Fix lint warnings in the javalite branch.Jisi Liu2017-03-092-0/+2
|/ /
* | Merge pull request #2810 from xfxyjwf/i1994Feng Xiao2017-03-091-4/+22
|\ \
| * | Avoid redundant type casts for oneof bytes fields.Feng Xiao2017-03-081-4/+22
| |/
* | Merge pull request #2775 from xfxyjwf/fixmajorFeng Xiao2017-03-092-1/+14
|\ \
| * | Undef major/minor if they are defined as macro.Feng Xiao2017-02-282-1/+14
* | | Merge pull request #2814 from pherl/javadeprecateJisi Liu2017-03-093-10/+28
|\ \ \ | |_|/ |/| |
| * | Add annotations for deprecated messages in JavaJisi Liu2017-03-093-10/+28
* | | Removed a stray return statement, causing compilation error.Manjunath Kudlur2017-03-061-1/+0
* | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-063-1/+144
|\ \ \