aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
* Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
|\
* \ Merge pull request #1386 from andrewharp/patch-2Gravatar Feng Xiao2016-04-05
|\ \
| | * Added access_level for typesGravatar Gaurav Vaish2016-04-05
| * | Update BUILDGravatar Andrew Harp2016-04-04
| * | Do not link in pthread library for Android builds.Gravatar Andrew Harp2016-04-04
|/ /
* | Merge pull request #852 from qzix/masterGravatar Thomas Van Lenten2016-04-04
|\ \ | |/ |/|
| * Added deprecated option handling for objective-c generatorGravatar Oleg Vereshko2016-04-04
* | Merge pull request #1353 from keveman/masterGravatar Joshua Haberman2016-04-01
|\ \
| * | Linking the cpp implementation extension statically with libprotobufGravatar Manjunath Kudlur2016-04-01
* | | Merge pull request #1377 from jskeet/remove-duplicate-testsGravatar Jon Skeet2016-04-01
|\ \ \
* \ \ \ Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersGravatar Thomas Van Lenten2016-04-01
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add -position and -isAtEnd for use when manually parsing input streams.Gravatar Thomas Van Lenten2016-04-01
|/ / /
| * / Remove duplicate test cases.Gravatar Jon Skeet2016-04-01
|/ /
* | Merge pull request #1369 from jskeet/tools-nuspecGravatar Jan Tattermusch2016-03-31
|\ \ | |/ |/|
* | Merge pull request #1371 from keveman/oversize_protosGravatar Joshua Haberman2016-03-31
|\ \
| * | Added an API to allow oversize protos when using C++ extension in PythonGravatar Manjunath Kudlur2016-03-31
* | | Merge pull request #1366 from xyzzyz/int128_ostreamGravatar Feng Xiao2016-03-31
|\ \ \ | |/ / |/| |
| | * Remove duplicate lineGravatar Jon Skeet2016-03-31
| | * Introduce a new nuget package, Google.Protobuf.Tools, basically to contain pr...Gravatar Jon Skeet2016-03-31
* | | Merge pull request #1362 from jskeet/tweak_json_nameGravatar Jan Tattermusch2016-03-30
|\ \ \
| | * | Replace #include <iostream> with #include <ostream>Gravatar Adam Michalik2016-03-30
| |/ / |/| |
* | | Merge pull request #1360 from pherl/masterGravatar Jisi Liu2016-03-30
|\ \ \
* \ \ \ Merge pull request #1295 from haberman/dockerGravatar Joshua Haberman2016-03-30
|\ \ \ \ | |_|_|/ |/| | |
| | | * Refactoring of FieldDescriptorGravatar Jon Skeet2016-03-30
| |_|/ |/| |
* | | Merge pull request #1326 from the-alien/csharp_json_nameGravatar Jon Skeet2016-03-30
|\ \ \
| | * \ Merge branch 'master' into dockerGravatar Josh Haberman2016-03-29
| | |\ \ | |_|/ / |/| | |
| | | * Use the T() instead of NULL for the default value.Gravatar Jisi Liu2016-03-29
| |_|/ |/| |
| * | Merge branch 'master' of https://github.com/google/protobuf into csharp_json_...Gravatar alien2016-03-29
| |\ \ | |/ / |/| |
| * | Code review fixesGravatar alien2016-03-29
* | | Merge pull request #1358 from thomasvl/travis_tweaksGravatar Thomas Van Lenten2016-03-29
|\ \ \
| * | | Mark iOS tests as able to fail.Gravatar Thomas Van Lenten2016-03-29
|/ / /
* | | Merge pull request #1350 from thomasvl/over_releaseGravatar Thomas Van Lenten2016-03-24
|\ \ \
| * | | The message was autoreleased, the -releases are an over release.Gravatar Thomas Van Lenten2016-03-24
|/ / /
* | | Merge pull request #1345 from smparkes/smparkes/well-known-protosGravatar Feng Xiao2016-03-23
|\ \ \
| * | | export well known protosGravatar Steven Parkes2016-03-22
|/ / /
* | | Merge pull request #1344 from topillar/patch-1Gravatar Feng Xiao2016-03-22
|\ \ \
| * | | Update coded_stream.hGravatar topillar2016-03-22
|/ / /
* | | Merge pull request #1335 from pradeepg26/masterGravatar Feng Xiao2016-03-21
|\ \ \
* \ \ \ Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationGravatar Thomas Van Lenten2016-03-21
|\ \ \ \
| * | | | Only create the readonlySemaphore on demand.Gravatar Thomas Van Lenten2016-03-21
|/ / / /
| * / / Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/ / /
| * / csharp: add support for the json_name optionGravatar alien2016-03-18
|/ /
* | Merge pull request #1325 from thomasvl/shrink_overheadGravatar Thomas Van Lenten2016-03-17
|\ \
| * | Shrink ObjC overhead (generated size and some runtime sizes)Gravatar Thomas Van Lenten2016-03-17
|/ /
* | Merge pull request #1318 from smparkes/smparkes/grpcGravatar Feng Xiao2016-03-14
|\ \
* \ \ Merge pull request #1291 from sergiocampama/develGravatar Thomas Van Lenten2016-03-14
|\ \ \
* \ \ \ Merge pull request #1312 from petewarden/masterGravatar Jisi Liu2016-03-12
|\ \ \ \
| | | * | add java/util support based on java/util/pom.xmlGravatar Steven Parkes2016-03-11
| |_|/ / |/| | |
* | | | Merge pull request #1278 from smparkes/masterGravatar Jisi Liu2016-03-11
|\ \ \ \