aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #384 from google/csharpJie Luo2015-05-14314-55/+267908
|\
| * Merge pull request #382 from jtattermusch/integrate_from_masterJie Luo2015-05-13255-323/+84482
| |\
| | * Regenerate UnittestDropUnknownFields.csJan Tattermusch2015-05-131-2/+2
| | * Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-13254-321/+84480
| | |\
| * | \ Merge pull request #380 from jtattermusch/csharpJie Luo2015-05-131-8/+28
| |\ \ \ | | |/ / | |/| |
| | * | Update README.md for C#Jan Tattermusch2015-05-131-8/+28
| |/ /
| * | Merge pull request #379 from jskeet/csharpJie Luo2015-05-137-810/+3781
| |\ \
| | * | Update C# code generation scriptJon Skeet2015-05-131-3/+1
| | * | Remove the C#-specific field_presence_test.proto, using unittest_no_field_pre...Jon Skeet2015-05-136-807/+3780
| |/ /
| * | Merge pull request #373 from jtattermusch/csharp_generate_protoJon Skeet2015-05-1319-12118/+147
| |\ \
| | * | regenerated UnittestImportLite.csJan Tattermusch2015-05-121-1/+3
| | * | regenerated UnittestImportPublicLiteJan Tattermusch2015-05-121-1/+3
| | * | Regenerated UnittestExtrasLite.csJan Tattermusch2015-05-121-51/+48
| | * | Regenerated UnittestDropUnknownFields.csJan Tattermusch2015-05-121-77/+18
| | * | remove C# files not referenced in any projectJan Tattermusch2015-05-125-11783/+0
| | * | Regenerate some proto files after ClsCompliance has been droppedJan Tattermusch2015-05-123-47/+0
| | * | rename FieldPresence to correct nameJan Tattermusch2015-05-122-1/+1
| | * | got rid of the outdated mono subdirectoryJan Tattermusch2015-05-123-157/+0
| | * | draft of generate_protos.shJan Tattermusch2015-05-121-0/+52
| | * | add buildall script for monoJan Tattermusch2015-05-121-0/+22
| |/ /
| * | Merge pull request #372 from jtattermusch/csharp_cleanupJie Luo2015-05-122-13/+2
| |\ \
| | * | adding what was missing in .gitignoreJan Tattermusch2015-05-121-0/+2
| | * | lib subdir is not needed anymoreJan Tattermusch2015-05-121-13/+0
| |/ /
| * | Merge pull request #370 from jtattermusch/mono_fixesJie Luo2015-05-128-15/+2
| |\ \
| | * | Fix newline assertion in TestJsonFormatted on monoJan Tattermusch2015-05-121-1/+2
| | * | remove TreatWarningsAsError setting to allow building in MonodevelopJan Tattermusch2015-05-127-14/+0
| |/ /
| * | Merge pull request #366 from jskeet/csharpJan Tattermusch2015-05-1248-3039/+3049
| |\ \
| | * | Convert back to using NUnit, which is now loaded via NuGet.Jon Skeet2015-05-1248-3039/+3049
| |/ /
| * | Merge pull request #352 from jtattermusch/csharp_performance_fixJon Skeet2015-05-091-4/+24
| |\ \
| | * | Performance optimization for small messages without unknown fieldsJan Tattermusch2015-05-071-4/+24
| * | | Merge pull request #348 from jskeet/csharpJon Skeet2015-05-0730-9/+44
| |\ \ \ | | |/ / | |/| |
| | * | 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-0629-7/+41
| |/ /
| * | Merge pull request #330 from anandolee/csharpJie Luo2015-05-017-38/+1
| |\ \
| | * | Remove ClsCompliant declarations from C# codeJie Luo2015-05-017-38/+1
| * | | Merge pull request #321 from anandolee/csharpJie Luo2015-05-0113-52/+1152
| |\| |
| | * | fix commentsJie Luo2015-05-014-6/+5
| | * | Change field_presence_test.protoJie Luo2015-05-012-6/+2
| | * | fix commentsJie Luo2015-04-303-34/+5
| | * | fix commends from Jon SkeetJie Luo2015-04-307-48/+62
| | * | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharpJie Luo2015-04-30106-41222/+48786
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #324 from jskeet/csharpJon Skeet2015-04-3055-3744/+3278
| |\ \ \
| | * | | Change to using xUnit for all unit tests, and fetch that via NuGet.Jon Skeet2015-04-3055-3744/+3278
| * | | | Merge pull request #319 from jskeet/csharp_pclJon Skeet2015-04-3054-37484/+45514
| |\| | |
| | * | | Convert both the full and lite runtimes (and json/xml serialization assemblie...Jon Skeet2015-04-2954-37484/+45514
| |/ / /
| | * | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharpJie Luo2015-04-29163-20387/+1194
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #317 from jskeet/csharpJon Skeet2015-04-29163-20386/+1193
| |\ \ \
| | * | | Removing more C# project files.Jon Skeet2015-04-2918-1802/+0
| | * | | Remove CLS compliance from runtime code.Jon Skeet2015-04-2924-151/+1
| | * | | Update C# solution and AddressBook project.Jon Skeet2015-04-294-1389/+1192