5265 Commits (cd32aae377993b727447f1ba25bd186b530969cb)
 

Author SHA1 Message Date
Yilun Chong cd32aae377 Merge branch 'master' of https://github.com/google/protobuf into JavaCaliper 7 years ago
Yilun Chong 75523ec086 fix bugs 7 years ago
Jan Tattermusch 426cf6f31e Add auto-generated header to C# generated files (#4038) 7 years ago
Yilun Chong 34843eddfe Fix bugs 7 years ago
Feng Xiao a4f68d479a
Merge pull request #4044 from xfxyjwf/issue3268 7 years ago
Adam Cozzette 00ac5c1ab6
Merge pull request #4041 from acozzette/fix-license-issue-1775 7 years ago
Feng Xiao b3ac4417b7 Update generated code. 7 years ago
Jie Luo bfd254e14f
Add unknown field support for csharp (#3936) 7 years ago
Feng Xiao 50ef6a623e Avoid two consecutive underscores in macro name. 7 years ago
Feng Xiao 0a7120ac32
Merge pull request #4037 from xfxyjwf/issue2880 7 years ago
Adam Cozzette ecab9c65fb Added our standard license header to structurally_valid.cc and its test 7 years ago
Feng Xiao 5ce724bceb
Merge pull request #4036 from xfxyjwf/issue3093 7 years ago
Jisi Liu 0f9bfa8244
Merge pull request #4016 from jquesnelle/string-access-ub 7 years ago
Jisi Liu 27e877fdaa
Merge pull request #2834 from aj-michael/master 7 years ago
Feng Xiao 6c27550df0 Clarify default value behavior in JSON conversion. 7 years ago
Feng Xiao 75eceb8424 Update generated code. 7 years ago
Feng Xiao 8489612dad Update comments for Timestamp JSON format. 7 years ago
Yilun Chong 5e732e35c1 Add caliper supported to java benchmark 7 years ago
Jon Skeet 31c54d1289 Regenerated code from previous C# codegen commit 7 years ago
Jon Skeet 3e5bd2fd24 C# code generation changes to use bitwise comparisons for doubles 7 years ago
Jon Skeet f3e9a65d75 Compare floating point values bitwise in C# 7 years ago
Adam Cozzette 618f06fc9c
Merge pull request #4007 from graywolf/patch-1 7 years ago
Adam Cozzette a426833d1a
Merge pull request #4000 from Kwizatz/master 7 years ago
Adam Cozzette 9b09a2af14
Merge pull request #4017 from acozzette/update-file-lists 7 years ago
Adam Cozzette 0fcca8f910
Merge pull request #4018 from acozzette/android-portable-log2-floor 7 years ago
Jeffrey Quesnelle f5b086273a use const char* instead of const std::string& in normalize() 7 years ago
Adam Cozzette 63a0afca70 Use the portable version of Log2Floor for Clang with older Android NDK versions 7 years ago
Adam Cozzette 609d752650 Ran update_file_lists.sh to update Bazel and CMake file lists 7 years ago
Jeffrey Quesnelle b32c2a80e0 fix undefined behavior in C++03 7 years ago
Rodrigo Hernandez 24493eef93 Using binary one's complement to negate an unsigned int 7 years ago
W 0316ae802d
--pre is not necessary 7 years ago
Adam Cozzette 9021f623e1
Merge pull request #3988 from acozzette/down-integrate 7 years ago
Yilun Chong 173f3043d3
Merge pull request #3926 from BSBandme/down_sync_benchmark 7 years ago
Adam Cozzette e372df5c97 Fixed failing JS tests 7 years ago
Feng Xiao db7c043f6d
Merge pull request #3968 from fahhem/patch-2 7 years ago
Fahrzin Hemmati 35119e39a0 Add a check_protobuf_required_bazel_version() for use in WORKSPACEs 7 years ago
Yilun Chong 1fd6c1761e Fix bugs to pass tests 7 years ago
Adam Cozzette 7bb8584f9d Updated conformance failure lists 7 years ago
Thomas Van Lenten 716acc3b97 Remove Xcode directives on some configs. 7 years ago
Yilun Chong 1c062a65af Sync internal benchmark changes 7 years ago
Adam Cozzette 5d647e19e7 Updated Makefile.am to add a new file to EXTRA_DIST 7 years ago
Adam Cozzette 0ba8eea655 Merge branch 'master' into down-integrate 7 years ago
Adam Cozzette 92a7e778e7 Integrated internal changes from Google 7 years ago
Adam Cozzette a711e3d5b4
Merge pull request #3979 from acozzette/3.5.x-merge 7 years ago
Adam Cozzette a27da09339 Merge branch '3.5.x' into 3.5.x-merge 7 years ago
Paul Yang 94bb1eed17
Remove duplicate typedef. (#3975) 7 years ago
Paul Yang 74e7decbbf
Provide discardUnknonwnFields API in php (#3976) 7 years ago
Feng Xiao 6de51caed5
Merge pull request #3824 from anuraaga/dev_rag 7 years ago
Feng Xiao da89eb25ef
Merge pull request #3955 from linux-on-ibm-z/master 7 years ago
Jie Luo 6d6099553b
Update csharp version number (#3958) 7 years ago