aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-1373-92/+6218
|\
| * 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-0641-2/+5184
| |\ \ \
| | * | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-0641-2/+5184
| * | | | Don't hard-code the python pathTamir Duberstein2015-05-061-1/+1
| |/ / /
| * | | Merge pull request #315 from brianduff/sync_from_aospJisi Liu2015-04-2913-25/+211
| |\ \ \
| | * | | Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-281-0/+11
| | * | | Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-281-2/+8
| | * | | Expose generate_clear as an option.Brian Duff2015-04-281-0/+2
| | * | | Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-04-284-9/+68
| | * | | Add clone() method support for nano.Brian Duff2015-04-2811-5/+104
| | * | | When no clear() is generated, still initialize fields.Brian Duff2015-04-282-12/+21
| | * | | Fix bug with large extension field numbers.Brian Duff2015-04-281-1/+1
| | | |/ | | |/|
| * / | Include well-known type protos in "make install".Feng Xiao2015-04-231-1/+11
| |/ /
| * | Include all well-known type protos.Feng Xiao2015-04-208-21/+425
* | | 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-1736-52/+5213
|\ \ \ | |/ / |/| |
| * | forgot to include header files into automake templateJan Tattermusch2015-04-171-1/+15
| * | 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-2636-49/+6640
* | | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-101-3/+4
* | | Change fixture name to be consistentTamir Duberstein2015-03-312-3/+3
* | | Delete "SEBS" (aka: Clean up Kenton's old trash)Kenton Varda2015-03-261-240/+0