Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #394 from ironhidegames/csharp-aot-ios | Jan Tattermusch | 2015-05-21 | 1 | -3/+15 |
|\ | |||||
| * | added concrete IEqualityComparer<ExtensionIntPair> implementation in Extensio... | Ruben Garat | 2015-05-20 | 1 | -3/+15 |
* | | Merge pull request #406 from AustinSchuh/unsigned_has_bits | Feng Xiao | 2015-05-20 | 3 | -16/+16 |
|\ \ | |||||
| * | | Marked compiler literal unsigned. | Austin Schuh | 2015-05-19 | 3 | -16/+16 |
* | | | Merge pull request #399 from jtattermusch/csharp_travis | Jie Luo | 2015-05-20 | 2 | -0/+15 |
|\ \ \ | |/ / |/| | | |||||
| * | | csharp travis integration | Jan Tattermusch | 2015-05-18 | 2 | -0/+15 |
* | | | Merge pull request #405 from cfallin/ruby-speed | Joshua Haberman | 2015-05-19 | 7 | -29/+45 |
|\ \ \ | |/ / |/| | | |||||
| * | | Ruby C extension speedup: don't re-intern constant string needlessly. | Chris Fallin | 2015-05-19 | 7 | -29/+45 |
|/ / | |||||
* | | Merge pull request #397 from jskeet/csharp | Jan Tattermusch | 2015-05-18 | 5 | -39464/+31319 |
|\ \ | |||||
| * | | Generate *all* protos in the script, applying fixups. | Jon Skeet | 2015-05-16 | 5 | -39464/+31319 |
* | | | Merge pull request #387 from cfallin/ruby-upb-update | Joshua Haberman | 2015-05-18 | 6 | -749/+1408 |
|\ \ \ | |||||
| * | | | Update MRI C Ruby extension to use new version of upb. | Chris Fallin | 2015-05-15 | 6 | -749/+1408 |
* | | | | Merge pull request #398 from thomasvl/post_csharp_quick_updates | Paul Yang | 2015-05-18 | 9 | -13/+36 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Post csharp landing fixup. | Thomas Van Lenten | 2015-05-18 | 9 | -13/+36 |
|/ / / | |||||
* | | | Merge pull request #351 from tamird/remove-manifest-fix-dist | Joshua Haberman | 2015-05-15 | 3 | -13/+15 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Only generate protos in development | Tamir Duberstein | 2015-05-15 | 2 | -0/+8 |
| * | | 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 |