aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #404 from anandolee/masterJie Luo2015-05-2910-53/+463
|\
| * Add oneof support for C#Jie Luo2015-05-2910-53/+463
* | Fixes on visual studio 2008unknown2015-05-277-11/+14
* | Replace "\\" with "/" for windows path names.Feng Xiao2015-05-261-0/+4
* | In std11, on mac, operator new doesn't take right reference.TeBoring2015-05-261-1/+1
* | Merge pull request #430 from xfxyjwf/std11_fixPaul Yang2015-05-261-0/+12
|\ \
| * | Make MapAllocator work with C++11.Feng Xiao2015-05-261-0/+12
* | | Merge pull request #429 from xfxyjwf/std11_fixPaul Yang2015-05-261-6/+0
|\| |
| * | Remove std::is_trivially_default_constructible.Feng Xiao2015-05-261-6/+0
* | | When doing make distcheck, a src/google/protobuf/compiler/ruby is created toBo Yang2015-05-261-3/+3
|/ /
* | uint64 has non-trivial destructor on 32-bit windows. This cause arenaBo Yang2015-05-261-5/+5
* | Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
* | Explicitly call destructor of Mutex to release resources.Feng Xiao2015-05-251-1/+5
* | Make hash_map forward constructor parameters to its base class.Feng Xiao2015-05-251-6/+17
* | Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src...Bo Yang2015-05-254-7/+150
* | Fix bugs on windows.Bo Yang2015-05-2411-41/+64
* | Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-241-4/+5
|/
* 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-21142-2990/+15154
|\ \ \
| * | | down-integrate internal changesBo Yang2015-05-21142-2990/+15154
| |/ /
* | | 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-1462-55/+5299
|\ \
| * \ Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-1373-92/+6218
| |\ \
| * | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 17:29:27 +0000