aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Fix links to the New BSD License in meta-dataSebastian Schuberth2017-02-285-7/+7
* | | | | | There might be duplicated enum values when allow_alias is true. Add Preferred...Jie Luo2017-02-286-94/+250
|/ / / / /
* | | | | Merge pull request #2733 from wmamrak/patch-1Adam Cozzette2017-02-271-1/+1
|\ \ \ \ \
| * | | | | Disable MSVC warning C4309Wojciech Mamrak2017-02-181-1/+1
* | | | | | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Adam Cozzette2017-02-271-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix unresolved symbols with MSVC12 and /Zc:inlineMarcel Raad2017-02-171-6/+6
| |/ / / /
* | | | | Merge pull request #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-242-14/+20
|\ \ \ \ \
| * | | | | Speed up JSON parsing.Feng Xiao2016-11-102-14/+20
* | | | | | Merge pull request #2732 from AsturaPhoenix/masterAdam Cozzette2017-02-241-1/+1
|\ \ \ \ \ \
| * | | | | | const FieldDescriptorCompareRoss Wang2017-02-171-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2747 from liutikas/masterAdam Cozzette2017-02-241-0/+2
|\ \ \ \ \ \
| * | | | | | Fix compiler warnings about unused variables in generated_message_reflection.hAurimas Liutikas2017-02-221-0/+2
* | | | | | | Merge pull request #2734 from msabramo/patch-1Adam Cozzette2017-02-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | README.md: Make docs URL a linkMarc Abramowitz2017-02-181-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2630 from blodan/masterJisi Liu2017-02-241-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | FreeBSD compatibilityDaniel Ylitalo2017-01-251-1/+1
* | | | | | | Merge pull request #2753 from thomasvl/recursive_dropThomas Van Lenten2017-02-233-0/+324
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add GPBMessageDropUnknownFieldsRecursively() and tests.Thomas Van Lenten2017-02-233-0/+324
|/ / / / / /
* | | | | | Updating READMEJohn Brock2017-02-231-2/+52
* | | | | | Upgrading test-related librariesJohn Brock2017-02-231-2/+2
* | | | | | Fixes for .NET 3.5 compatibilityJohn Brock2017-02-2313-13/+154
| |_|/ / / |/| | | |
* | | | | Merge pull request #2736 from na-ka-na/master3Feng Xiao2017-02-216-1/+63
|\ \ \ \ \ | |_|/ / / |/| | | |