aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
| | * | | | | Ignore more derived files.Tres Seaver2015-01-131-1/+2
| | * | | | | Merge branch 'ignore_so_libs' into straddle_py2_py3Tres Seaver2015-01-131-0/+1
| | |\ \ \ \ \
| | | * | | | | Ignore .so files.Tres Seaver2015-01-131-0/+1
| | | |/ / / /
| | * | | | | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
| | * | | | | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
| | * | | | | Compatibility with Python2.6 unittest.Tres Seaver2015-01-134-21/+35
| | * | | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
| | * | | | | Typo.Tres Seaver2015-01-131-1/+1
| | * | | | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Overlooked dependency.Tres Seaver2015-01-131-1/+1
| | * | | | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+100
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1322-96/+100
| | | |/ / / /
| | * / / / / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
| | |/ / / /
* | | | | | Merge pull request #734 from TeBoring/beta-1Feng Xiao2015-08-2522-90/+148
|\ \ \ \ \ \
| * | | | | | Fix bugs on windowsBo Yang2015-08-2538-468/+553
* | | | | | | Merge pull request #735 from pherl/beta-1Jisi Liu2015-08-253-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Update cmake and BUILD files.Jisi Liu2015-08-253-2/+12
|/ / / / / / /
* | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-252-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Make the PARSER @Deprecated public.Feng Xiao2015-08-252-2/+11
* | | | | | | | Update descriptor protos.Jisi Liu2015-08-2513-376/+393
* | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-25244-3813/+13905
|\| | | | | | |
| * | | | | | | Delete incorrectly placed test file.Feng Xiao2015-08-251-132/+0
| * | | | | | | Merge Java util package to github.Feng Xiao2015-08-2510-0/+4736
| |/ / / / / /
| * | | | | | Cherry-pick Java utf8 change.Feng Xiao2015-08-245-9/+149
| * | | | | | Down-integrate from internal code base.Feng Xiao2015-08-2319-144/+669
| * | | | | | Down-integrate from google3.Feng Xiao2015-08-22226-3661/+8484
* | | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-252-9/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix gcc C++11 buildNobuaki Sukegawa2015-08-012-9/+4
* | | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-21477-257657/+40241
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #584 from haberman/cwarningsJoshua Haberman2015-08-217-249/+354
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Return TypedData_Wrap_Struct directly.Josh Haberman2015-08-202-4/+2
| | * | | | | Conform to C89/C90 variable declaration rules.Josh Haberman2015-07-107-247/+354
| * | | | | | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-144-150/+183
| |\ \ \ \ \ \
| | * | | | | | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-142-149/+176
| | * | | | | | add a failing descriptor testJan Tattermusch2015-08-141-0/+7
| | * | | | | | remove duplicate test caseJan Tattermusch2015-08-141-1/+0
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-146-94/+288
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-146-94/+288
| * | | | | | Merge pull request #716 from haberman/fixrubyJoshua Haberman2015-08-133-123/+141
| |\ \ \ \ \ \
| | * | | | | | Fixed several Ruby conformance test cases through upb update.Josh Haberman2015-08-123-123/+141
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #718 from jskeet/descriptor-descriptorJan Tattermusch2015-08-133-2/+27
| |\ \ \ \ \ \
| | * | | | | | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-133-2/+27
| |/ / / / / /
| * | | | | | Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Install headers from extract_includes for all platformsKonstantin Podsvirov2015-08-041-1/+1
| | * | | | | Fix: comment typoKonstantin Podsvirov2015-08-031-1/+1
| | * | | | | Install well-known type proto files from CMake projectKonstantin Podsvirov2015-08-032-3/+57
| | * | | | | CMake installation now compatible with origin FindProtobuf moduleKonstantin Podsvirov2015-08-023-2/+156
| | * | | | | Parsing version from configure.ac for CMake projectKonstantin Podsvirov2015-08-012-15/+24
| | * | | | | Install protobuf from cmake projectKonstantin Podsvirov2015-07-314-0/+85
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 14:29:26 +0000