aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\
| * Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
* | Repeated/Map field setter should accept a regular PHP array (#2817)Paul Yang2017-03-109-41/+355
* | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-097-0/+15
|\ \
| * | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
| * | Fix lint warnings in the javalite branch.Jisi Liu2017-03-096-0/+11
| |/
* | Merge pull request #2809 from xfxyjwf/i2464Feng Xiao2017-03-092-4/+11
|\ \ | |/ |/|
| * Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
* | Merge pull request #2819 from haberman/pythonexceptJoshua Haberman2017-03-091-1/+1
|\ \
| * | update_failure_list.py: fixed Python "raise" statement.Josh Haberman2017-03-091-1/+1
* | | Merge pull request #2804 from acozzette/ruby-memcpyAdam Cozzette2017-03-093-1/+60
|\ \ \
| * | | Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibcAdam Cozzette2017-03-093-1/+60
| |/ /
* | | 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
* | | | Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\ \ \ \
| * | | | Update AbstractMessage.javagoorov2017-01-131-1/+1
| * | | | Update AbstractMessage.javagoorov2017-01-121-1/+4
* | | | | Fix Bad Link for Common LispJie Luo2017-03-081-1/+1
* | | | | Rename encode/decode to serializeToString/mergeFromString (#2795)Paul Yang2017-03-0814-62/+314
| |_|_|/ |/| | |
* | | | Merge pull request #2793 from keveman/masterFeng Xiao2017-03-071-1/+0
|\ \ \ \
| * | | | Removed a stray return statement, causing compilation error.Manjunath Kudlur2017-03-061-1/+0
* | | | | Merge pull request #2613 from aausch/fix_memory_leakJisi Liu2017-03-061-1/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cache generated classes, optimization and quick workaround to memory leakAlex Ausch2017-01-301-1/+8
* | | | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-064-1/+145
|\ \ \ \ \
| * | | | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-024-1/+145
* | | | | | Merge pull request #2751 from keveman/masterFeng Xiao2017-03-061-9/+21
|\ \ \ \ \ \
| * | | | | | Added comment explaining the protobuf_headers target.Manjunath Kudlur2017-03-021-0/+4
| * | | | | | Added a header only cc_library target for the protobuf library.Manjunath Kudlur2017-02-231-9/+17
* | | | | | | Merge pull request #2784 from acozzette/log-2-floor-intAdam Cozzette2017-03-031-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Return uint32 from Log2FloorNonZero64Adam Cozzette2017-03-021-1/+1
* | | | | | | Merge pull request #2755 from xfxyjwf/rubycompFeng Xiao2017-03-0211-1/+2009
|\ \ \ \ \ \ \
| * | | | | | | Add Ruby compatibilty test against 3.0.0.Feng Xiao2017-02-2711-1/+2009
* | | | | | | | Merge pull request #2785 from thomasvl/threading_raceThomas Van Lenten2017-03-024-9/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Handing threading race resolving methods.Thomas Van Lenten2017-03-024-9/+46
|/ / / / / / /
* | | | | | | Merge pull request #2774 from acozzette/closure-builderAdam Cozzette2017-03-024-3/+32
|\ \ \ \ \ \ \
| * | | | | | | Use closurebuilder.py in favor of calcdeps.py for compiling JavaScriptAdam Cozzette2017-03-014-3/+32
* | | | | | | | Disable static analyzer for message semaphore creation (#2748)Sergio Campamá2017-03-011-0/+8
* | | | | | | | Fix gcc 4.1 build (#1035) (#1913)Matt Hauck2017-03-013-19/+31
* | | | | | | | Change hint type to `const void*` (#2568)Matt Hauck2017-03-011-1/+1
* | | | | | | | Add mergeFrom method on Message (#2766)Paul Yang2017-03-0111-7/+439
|/ / / / / / /
* | | | | | | Merge pull request #2674 from acozzette/js-test-cleanupAdam Cozzette2017-03-011-2/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Removed log statement from writer_test.jsAdam Cozzette2017-02-281-2/+0
|/ / / / / /
* | | | | | Merge pull request #2770 from xfxyjwf/fixcmakeJisi Liu2017-02-2814-410/+410
|\ \ \ \ \ \
| * | | | | | Remove the use of C++11 features.Feng Xiao2017-02-2714-410/+410
* | | | | | | Merge pull request #2772 from sschuberth/masterFeng Xiao2017-02-289-15/+15
|\ \ \ \ \ \ \
| * | | | | | | Prefer the term "3-Clause BSD License" over "New BSD License"Sebastian Schuberth2017-02-289-11/+11