Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow tests to run on OS X | Tamir Duberstein | 2015-05-15 | 1 | -1/+2 |
* | Don't hardcode bash | Tamir Duberstein | 2015-05-15 | 2 | -2/+2 |
* | Use glob to simplify | Tamir Duberstein | 2015-05-15 | 1 | -10/+3 |
* | Merge pull request #338 from skippy/encode-decode-helpers | Chris Fallin | 2015-05-15 | 11 | -114/+182 |
|\ | |||||
| * | adding and simplifying encoders/decoders | Adam Greene | 2015-05-13 | 11 | -114/+182 |
* | | Merge pull request #391 from jtattermusch/generate_protos_windows_friendly | Jie Luo | 2015-05-15 | 3 | -8/+23 |
|\ \ | |||||
| * | | Make generate_protos.sh Windows-friendly. | Jon Skeet | 2015-05-14 | 3 | -8/+23 |
* | | | Merge pull request #385 from cfallin/travis-refactor | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
|\ \ \ | |||||
| * | | | Refactor Travis tests: split configs and run in parallel. | Chris Fallin | 2015-05-14 | 3 | -20/+172 |
* | | | | Merge pull request #384 from google/csharp | Jie Luo | 2015-05-14 | 314 | -55/+267908 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #382 from jtattermusch/integrate_from_master | Jie Luo | 2015-05-13 | 255 | -323/+84482 |
| |\ \ \ | |||||
| | * | | | Regenerate UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-13 | 1 | -2/+2 |
| | * | | | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 254 | -321/+84480 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge pull request #380 from jtattermusch/csharp | Jie Luo | 2015-05-13 | 1 | -8/+28 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Update README.md for C# | Jan Tattermusch | 2015-05-13 | 1 | -8/+28 |
| |/ / / | |||||
| * | | | Merge pull request #379 from jskeet/csharp | Jie Luo | 2015-05-13 | 7 | -810/+3781 |
| |\ \ \ | |||||
| | * | | | Update C# code generation script | Jon Skeet | 2015-05-13 | 1 | -3/+1 |
| | * | | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_pre... | Jon Skeet | 2015-05-13 | 6 | -807/+3780 |
| |/ / / | |||||
| * | | | Merge pull request #373 from jtattermusch/csharp_generate_proto | Jon Skeet | 2015-05-13 | 19 | -12118/+147 |
| |\ \ \ | |||||
| | * | | | regenerated UnittestImportLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | * | | | regenerated UnittestImportPublicLite | Jan Tattermusch | 2015-05-12 | 1 | -1/+3 |
| | * | | | Regenerated UnittestExtrasLite.cs | Jan Tattermusch | 2015-05-12 | 1 | -51/+48 |
| | * | | | Regenerated UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-12 | 1 | -77/+18 |
| | * | | | remove C# files not referenced in any project | Jan Tattermusch | 2015-05-12 | 5 | -11783/+0 |
| | * | | | Regenerate some proto files after ClsCompliance has been dropped | Jan Tattermusch | 2015-05-12 | 3 | -47/+0 |
| | * | | | rename FieldPresence to correct name | Jan Tattermusch | 2015-05-12 | 2 | -1/+1 |
| | * | | | got rid of the outdated mono subdirectory | Jan Tattermusch | 2015-05-12 | 3 | -157/+0 |
| | * | | | draft of generate_protos.sh | Jan Tattermusch | 2015-05-12 | 1 | -0/+52 |
| | * | | | add buildall script for mono | Jan Tattermusch | 2015-05-12 | 1 | -0/+22 |
| |/ / / | |||||
| * | | | Merge pull request #372 from jtattermusch/csharp_cleanup | Jie Luo | 2015-05-12 | 2 | -13/+2 |
| |\ \ \ | |||||
| | * | | | adding what was missing in .gitignore | Jan Tattermusch | 2015-05-12 | 1 | -0/+2 |
| | * | | | lib subdir is not needed anymore | Jan Tattermusch | 2015-05-12 | 1 | -13/+0 |
| |/ / / | |||||
| * | | | Merge pull request #370 from jtattermusch/mono_fixes | Jie Luo | 2015-05-12 | 8 | -15/+2 |
| |\ \ \ | |||||
| | * | | | Fix newline assertion in TestJsonFormatted on mono | Jan Tattermusch | 2015-05-12 | 1 | -1/+2 |
| | * | | | remove TreatWarningsAsError setting to allow building in Monodevelop | Jan Tattermusch | 2015-05-12 | 7 | -14/+0 |
| |/ / / | |||||
| * | | | Merge pull request #366 from jskeet/csharp | Jan Tattermusch | 2015-05-12 | 48 | -3039/+3049 |
| |\ \ \ | |||||
| | * | | | Convert back to using NUnit, which is now loaded via NuGet. | Jon Skeet | 2015-05-12 | 48 | -3039/+3049 |
| |/ / / | |||||
| * | | | Merge pull request #352 from jtattermusch/csharp_performance_fix | Jon Skeet | 2015-05-09 | 1 | -4/+24 |
| |\ \ \ | |||||
| | * | | | Performance optimization for small messages without unknown fields | Jan Tattermusch | 2015-05-07 | 1 | -4/+24 |
| * | | | | Merge pull request #348 from jskeet/csharp | Jon Skeet | 2015-05-07 | 30 | -9/+44 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Regenerate descriptor.pb.cc after csharp_namespace change | Jon Skeet | 2015-05-07 | 1 | -2/+3 |
| | * | | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | Jon Skeet | 2015-05-06 | 29 | -7/+41 |
| |/ / / | |||||
| * | | | Merge pull request #330 from anandolee/csharp | Jie Luo | 2015-05-01 | 7 | -38/+1 |
| |\ \ \ | |||||
| | * | | | Remove ClsCompliant declarations from C# code | Jie Luo | 2015-05-01 | 7 | -38/+1 |
| * | | | | Merge pull request #321 from anandolee/csharp | Jie Luo | 2015-05-01 | 13 | -52/+1152 |
| |\| | | | |||||
| | * | | | fix comments | Jie Luo | 2015-05-01 | 4 | -6/+5 |
| | * | | | Change field_presence_test.proto | Jie Luo | 2015-05-01 | 2 | -6/+2 |
| | * | | | fix comments | Jie Luo | 2015-04-30 | 3 | -34/+5 |
| | * | | | fix commends from Jon Skeet | Jie Luo | 2015-04-30 | 7 | -48/+62 |
| | * | | | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp | Jie Luo | 2015-04-30 | 106 | -41222/+48786 |
| | |\ \ \ | | |/ / / | |/| | | |