aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #734 from TeBoring/beta-1Gravatar Feng Xiao2015-08-25
|\
| * Fix bugs on windowsGravatar Bo Yang2015-08-25
* | Merge pull request #735 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\ \
| * | Update cmake and BUILD files.Gravatar Jisi Liu2015-08-25
|/ /
* | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \
* | | Update descriptor protos.Gravatar Jisi Liu2015-08-25
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \ \
| | * | Make the PARSER @Deprecated public.Gravatar Feng Xiao2015-08-25
| |/ /
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Gravatar Jisi Liu2015-08-25
|\ \ \
| | * | Delete incorrectly placed test file.Gravatar Feng Xiao2015-08-25
| | * | Merge Java util package to github.Gravatar Feng Xiao2015-08-25
| | |/
| | * Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
| | * Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
| | * Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| |/ |/|
* | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2015-08-21
|\ \
* | | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| * | Merge pull request #584 from haberman/cwarningsGravatar Joshua Haberman2015-08-21
| |\ \
| | * | Return TypedData_Wrap_Struct directly.Gravatar Josh Haberman2015-08-20
| * | | Merge pull request #720 from jtattermusch/csharp_fixesGravatar Jon Skeet2015-08-14
| |\ \ \
| | * | | fix type initialization problem with FileDescriptorGravatar Jan Tattermusch2015-08-14
| | * | | add a failing descriptor testGravatar Jan Tattermusch2015-08-14
| | * | | remove duplicate test caseGravatar Jan Tattermusch2015-08-14
| * | | | Merge pull request #571 from thomasvl/validation_supportGravatar Paul Yang2015-08-14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add support for a file listing expected package to objc prefixes for validation.Gravatar Thomas Van Lenten2015-08-14
| * | | | Merge pull request #716 from haberman/fixrubyGravatar Joshua Haberman2015-08-13
| |\ \ \ \
| * \ \ \ \ Merge pull request #718 from jskeet/descriptor-descriptorGravatar Jan Tattermusch2015-08-13
| |\ \ \ \ \
| | * | | | | Allow public access to descriptor.proto as a dependency.Gravatar Jon Skeet2015-08-13
| |/ / / / /
| * | | | | Merge pull request #673 from podsvirov/topic-cmake-installGravatar Feng Xiao2015-08-12
| |\ \ \ \ \
| | | * | | | Fixed several Ruby conformance test cases through upb update.Gravatar Josh Haberman2015-08-12
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtimeGravatar Feng Xiao2015-08-12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | only link runtime libraries statically for a static buildGravatar Jan Tattermusch2015-08-12
| * | | | | Merge pull request #706 from thomasvl/revert_any_change_2Gravatar Paul Yang2015-08-11
| |\ \ \ \ \
| | * | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."Gravatar Thomas Van Lenten2015-08-11
| |/ / / / /
| * | | | | Merge pull request #649 from cijianzy/masterGravatar Paul Yang2015-08-11
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #703 from jskeet/more-todosGravatar Jan Tattermusch2015-08-10
| |\ \ \ \ \ \
| | * | | | | | More TODOs done.Gravatar Jon Skeet2015-08-10
| |/ / / / / /
| * | | | | | Merge pull request #701 from jskeet/map-viewsGravatar Jon Skeet2015-08-10
| |\ \ \ \ \ \
| | * | | | | | Fix parameter name in exception.Gravatar Jon Skeet2015-08-10
| * | | | | | | Merge pull request #699 from jskeet/validate_packedGravatar Jon Skeet2015-08-10
| |\ \ \ \ \ \ \
| | | * | | | | | Implement ICollection.CopyTo (using Array) for MapField views.Gravatar Jon Skeet2015-08-10
| | | | | * | | | make VS build link runtime staticallyGravatar Jan Tattermusch2015-08-08
| * | | | | | | | Merge pull request #700 from jskeet/remove-packed-hackGravatar Jan Tattermusch2015-08-08
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | | | * | | | | Implement Keys and Values as viewsGravatar Jon Skeet2015-08-08
| | |_|/ / / / / | |/| | | | | |
| | | * | | | | Make FieldDescriptor.IsPacked work appropriately.Gravatar Jon Skeet2015-08-08
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #695 from jskeet/remove-todosGravatar Jon Skeet2015-08-08
| |\ \ \ \ \ \
| | * | | | | | Address review comments.Gravatar Jon Skeet2015-08-08
| | * | | | | | Remove reference to generic types within XML comment.Gravatar Jon Skeet2015-08-08
| | * | | | | | Tidying up - fix a bunch of TODOs and remove outdated ones.Gravatar Jon Skeet2015-08-08
| |/ / / / / /
| * | | | | | Merge pull request #694 from jskeet/groupsGravatar Jon Skeet2015-08-08
| |\ \ \ \ \ \
| | * | | | | | Address review comments.Gravatar Jon Skeet2015-08-08