Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #734 from TeBoring/beta-1 | Feng Xiao | 2015-08-25 | 22 | -90/+148 |
|\ | |||||
| * | Fix bugs on windows | Bo Yang | 2015-08-25 | 38 | -468/+553 |
* | | Merge pull request #735 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 3 | -2/+12 |
|\ \ | |||||
| * | | Update cmake and BUILD files. | Jisi Liu | 2015-08-25 | 3 | -2/+12 |
|/ / | |||||
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | 2 | -2/+11 |
|\ \ | |||||
| * | | Make the PARSER @Deprecated public. | Feng Xiao | 2015-08-25 | 2 | -2/+11 |
* | | | Update descriptor protos. | Jisi Liu | 2015-08-25 | 13 | -376/+393 |
* | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | 244 | -3813/+13905 |
|\| | | |||||
| * | | Delete incorrectly placed test file. | Feng Xiao | 2015-08-25 | 1 | -132/+0 |
| * | | Merge Java util package to github. | Feng Xiao | 2015-08-25 | 10 | -0/+4736 |
| |/ | |||||
| * | Cherry-pick Java utf8 change. | Feng Xiao | 2015-08-24 | 5 | -9/+149 |
| * | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 19 | -144/+669 |
| * | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 226 | -3661/+8484 |
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 | Jisi Liu | 2015-08-25 | 2 | -9/+4 |
|\ \ | |/ |/| | |||||
| * | Fix gcc C++11 build | Nobuaki Sukegawa | 2015-08-01 | 2 | -9/+4 |
* | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 477 | -257657/+40241 |
|\ \ | |||||
| * \ | Merge pull request #584 from haberman/cwarnings | Joshua Haberman | 2015-08-21 | 7 | -249/+354 |
| |\ \ | |||||
| | * | | Return TypedData_Wrap_Struct directly. | Josh Haberman | 2015-08-20 | 2 | -4/+2 |
| | * | | Conform to C89/C90 variable declaration rules. | Josh Haberman | 2015-07-10 | 7 | -247/+354 |
| * | | | Merge pull request #720 from jtattermusch/csharp_fixes | Jon Skeet | 2015-08-14 | 4 | -150/+183 |
| |\ \ \ | |||||
| | * | | | fix type initialization problem with FileDescriptor | Jan Tattermusch | 2015-08-14 | 2 | -149/+176 |
| | * | | | add a failing descriptor test | Jan Tattermusch | 2015-08-14 | 1 | -0/+7 |
| | * | | | remove duplicate test case | Jan Tattermusch | 2015-08-14 | 1 | -1/+0 |
| * | | | | Merge pull request #571 from thomasvl/validation_support | Paul Yang | 2015-08-14 | 6 | -94/+288 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add support for a file listing expected package to objc prefixes for validation. | Thomas Van Lenten | 2015-08-14 | 6 | -94/+288 |
| * | | | | Merge pull request #716 from haberman/fixruby | Joshua Haberman | 2015-08-13 | 3 | -123/+141 |
| |\ \ \ \ | |||||
| | * | | | | Fixed several Ruby conformance test cases through upb update. | Josh Haberman | 2015-08-12 | 3 | -123/+141 |
| * | | | | | Merge pull request #718 from jskeet/descriptor-descriptor | Jan Tattermusch | 2015-08-13 | 3 | -2/+27 |
| |\ \ \ \ \ | |||||
| | * | | | | | Allow public access to descriptor.proto as a dependency. | Jon Skeet | 2015-08-13 | 3 | -2/+27 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #673 from podsvirov/topic-cmake-install | Feng Xiao | 2015-08-12 | 5 | -0/+302 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Install headers from extract_includes for all platforms | Konstantin Podsvirov | 2015-08-04 | 1 | -1/+1 |
| | * | | | | Fix: comment typo | Konstantin Podsvirov | 2015-08-03 | 1 | -1/+1 |
| | * | | | | Install well-known type proto files from CMake project | Konstantin Podsvirov | 2015-08-03 | 2 | -3/+57 |
| | * | | | | CMake installation now compatible with origin FindProtobuf module | Konstantin Podsvirov | 2015-08-02 | 3 | -2/+156 |
| | * | | | | Parsing version from configure.ac for CMake project | Konstantin Podsvirov | 2015-08-01 | 2 | -15/+24 |
| | * | | | | Install protobuf from cmake project | Konstantin Podsvirov | 2015-07-31 | 4 | -0/+85 |
| * | | | | | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime | Feng Xiao | 2015-08-12 | 1 | -0/+13 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | only link runtime libraries statically for a static build | Jan Tattermusch | 2015-08-12 | 1 | -12/+13 |
| | * | | | | make VS build link runtime statically | Jan Tattermusch | 2015-08-08 | 1 | -0/+12 |
| * | | | | | Merge pull request #706 from thomasvl/revert_any_change_2 | Paul Yang | 2015-08-11 | 3 | -121/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any." | Thomas Van Lenten | 2015-08-11 | 3 | -121/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #649 from cijianzy/master | Paul Yang | 2015-08-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update GPBWellKnownTypes.m | Yue Zhang | 2015-07-29 | 1 | -1/+1 |
| * | | | | | | Merge pull request #703 from jskeet/more-todos | Jan Tattermusch | 2015-08-10 | 7 | -126/+168 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | More TODOs done. | Jon Skeet | 2015-08-10 | 7 | -126/+168 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #701 from jskeet/map-views | Jon Skeet | 2015-08-10 | 2 | -4/+180 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix parameter name in exception. | Jon Skeet | 2015-08-10 | 1 | -1/+1 |
| | * | | | | | | Implement ICollection.CopyTo (using Array) for MapField views. | Jon Skeet | 2015-08-10 | 2 | -1/+26 |
| | * | | | | | | Implement Keys and Values as views | Jon Skeet | 2015-08-08 | 2 | -4/+155 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #699 from jskeet/validate_packed | Jon Skeet | 2015-08-10 | 3 | -4/+18 |
| |\ \ \ \ \ \ |