aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASHFeng Xiao2015-05-221-1/+1
|\
| * Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.Yohei Yukawa2015-05-041-1/+1
* | Merge pull request #410 from thomasvl/objc_alpha2_dropPaul Yang2015-05-2220-101/+223
|\ \
| * | Objective C Second Alpha DropThomas Van Lenten2015-05-2220-101/+223
* | | Merge pull request #413 from TeBoring/masterPaul Yang2015-05-21141-2990/+15127
|\ \ \
| * | | down-integrate internal changesBo Yang2015-05-21141-2990/+15127
| |/ /
* | | Merge pull request #411 from xfxyjwf/masterPaul Yang2015-05-211-0/+64
|\ \ \
| * | | Add default import paths for descriptor.proto and other well-known types to p...Feng Xiao2015-05-211-0/+64
| |/ /
* / / Include well-known types in Java runtime.Feng Xiao2015-05-211-0/+3
|/ /
* | Merge pull request #402 from thomasvl/objc_on_winPaul Yang2015-05-219-102/+28
|\ \
| * | Getting the ObjC generator building on Windows.Thomas Van Lenten2015-05-199-102/+28
* | | Marked compiler literal unsigned.Austin Schuh2015-05-193-16/+16
|/ /
* | Post csharp landing fixup.Thomas Van Lenten2015-05-187-13/+18
* | Merge pull request #384 from google/csharpJie Luo2015-05-1461-53/+5266
|\ \
| * \ Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-1372-91/+6182
| |\ \
| * | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_pre...Jon Skeet2015-05-131-1/+1
| * | | Regenerate descriptor.pb.cc after csharp_namespace changeJon Skeet2015-05-071-2/+3
| * | | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-0627-7/+35
| * | | Remove ClsCompliant declarations from C# codeJie Luo2015-05-017-38/+1
| * | | fix bug for Field PresenceJie Luo2015-04-272-2/+2
| * | | Field Presence: remove has methods for optional non-message fields in proto3Jie Luo2015-04-274-42/+129
| * | | Merge pull request #288 from jtattermusch/csharp_protobuf_reviewedJie Luo2015-04-1735-50/+5180
| |\ \ \
| | * | | temporarily removing csharp_umbrella_namespace file optionJan Tattermusch2015-04-174-233/+46
| | * | | removing csharp_property_name field optionJan Tattermusch2015-04-174-223/+35
| | * | | one more fix to csharp_umbrella_namespace commentJan Tattermusch2015-04-171-3/+5
| | * | | fix: do not mention umbrella_classname in commentJan Tattermusch2015-04-171-1/+1
| | * | | Fixed comment for csharp_umbrella_namespace (nest_classes has been removed)Jan Tattermusch2015-04-161-2/+1
| | * | | fixing field number of csharp_umbrella_namespace optionJan Tattermusch2015-04-163-15/+15
| | * | | integrate CalcSerializedSize() fix from protobuf-csharp-port issue 84Jan Tattermusch2015-04-131-4/+12
| | * | | fixing implementation of GetFileUmbrellaNamespaceJan Tattermusch2015-04-131-18/+22
| | * | | implemented HasRequiredFields logicJan Tattermusch2015-04-131-2/+37
| | * | | addressed TODO for lite runtimeJan Tattermusch2015-04-131-7/+11
| | * | | creating private ctor for builders is now the default (as it used to be for o...Jan Tattermusch2015-04-131-0/+1
| | * | | output file naming logic, configurable file extension, comment rewordingJan Tattermusch2015-04-133-16/+24
| | * | | added support for deprecated fields, reworded some todosJan Tattermusch2015-04-133-8/+6
| | * | | enable overriding of property name using csharp_property_nameJan Tattermusch2015-04-131-1/+3
| | * | | updated C# codegen to use restricted set of csharp options from descriptor.protoJan Tattermusch2015-04-138-52/+27
| | * | | restricted number of csharp options and regenerated descriptor.protoJan Tattermusch2015-04-133-1348/+243
| | * | | Rewrote C# protogen to C++ (initial version)Jan Tattermusch2015-03-2635-47/+6621
* | | | | Include generated code of well-known types in protobuf C++ runtime.Feng Xiao2015-05-1122-0/+15638
| |_|/ / |/| | |
* | | | Merge branch 'gerrit' to 'master'Feng Xiao2015-05-0713-15/+265
|\ \ \ \
| * | | | Modify directory to use in testBo Yang2015-04-272-0/+10
| * | | | Handle un-handled cases of TestOneof2 in unittestBo Yang2015-04-271-0/+9
| * | | | internal changesBo Yang2015-04-2410-15/+246
* | | | | Merge pull request #101 from fizbin/fix_large_proto_java_codeFeng Xiao2015-05-075-26/+116
|\ \ \ \ \
| * | | | | More 'int' return value documentationDaniel Martin2015-04-091-1/+5
| * | | | | CR feedback: spacing, document return valuesDaniel Martin2015-04-082-1/+5
| * | | | | Fix java compilation issues when processing large .proto filesDaniel Martin2014-11-255-25/+107
* | | | | | Merge pull request #331 from thomasvl/objc_alpha1_dropPaul Yang2015-05-0640-2/+5159
|\ \ \ \ \ \
| * | | | | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-0640-2/+5159
| | |_|_|_|/ | |/| | | |