aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #610 from jskeet/fix-enumeratorJon Skeet2015-07-162-63/+6
|\
| * Remove the struct-based iterator for RepeatedField.Jon Skeet2015-07-162-63/+6
|/
* Merge pull request #605 from jtattermusch/csharp_cleanupJon Skeet2015-07-166-10/+5
|\
| * added comment for ByteString.CopyFromJan Tattermusch2015-07-151-0/+2
| * C# cleanup - assorted nitsJan Tattermusch2015-07-155-10/+3
|/
* Merge pull request #606 from jtattermusch/csharp-experimental-mergedJon Skeet2015-07-1639-430/+761
|\
| * Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-1539-430/+761
|/|
| * Merge pull request #591 from pherl/fixbuildJisi Liu2015-07-131-1/+0
| |\
| | * remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
| |/
| * Merge pull request #588 from haberman/conformance-jsonJoshua Haberman2015-07-136-52/+263
| |\
| | * Added support for Json and valid input to conformance tests.Josh Haberman2015-07-106-52/+263
| |/
| * Merge pull request #570 from google/internal-third-partyPaul Yang2015-07-0911-158/+167
| |\
| | * Internal local modifications.Bo Yang2015-07-0911-158/+167
| |/
| * Merge pull request #575 from haberman/rbleakJoshua Haberman2015-07-081-1/+13
| |\
| | * Worked around memory leak bug in Ruby interpreter.Josh Haberman2015-07-081-1/+13
| |/
| * Merge pull request #554 from jcanizales/proto-objc-bazelPaul Yang2015-07-063-35/+50
| |\
| | * Add Bazel target for protobuf ObjC runtimeJorge Canizales2015-07-063-35/+50
| * | Merge pull request #500 from TeBoring/tempPaul Yang2015-07-013-62/+94
| |\ \
| | * | Implement parsing for proto3 primitive repeated fields. Previously, forBo Yang2015-06-153-62/+94
| * | | Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
| |\ \ \
| | * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| | | |/ | | |/|
| * | | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
| |\ \ \
| | * | | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
| * | | | Merge pull request #556 from mgiuca/fix-clang-warningFeng Xiao2015-06-301-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
| |/ / /
| * | | Merge pull request #540 from pherl/clean-warningsJisi Liu2015-06-253-11/+6
| |\ \ \
| | * | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
| * | | | Merge pull request #512 from pherl/bazelPaul Yang2015-06-244-77/+140
| |\ \ \ \
| | * | | | Enable tests for bazel build.Jisi Liu2015-06-184-77/+140
| * | | | | Merge pull request #538 from google/jtattermusch-patch-1Jisi Liu2015-06-241-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
| |/ / / /
* | | | | Merge pull request #599 from jskeet/no-map-entriesJon Skeet2015-07-155-5779/+39
|\ \ \ \ \
| * | | | | Address requested change from code review.Jon Skeet2015-07-151-12/+12
| * | | | | Don't create nested types (or field accessors) for map types.Jon Skeet2015-07-155-5773/+33
|/ / / / /
* | | | | Merge pull request #594 from jskeet/csharp-wellknowntypesJan Tattermusch2015-07-1531-130/+4808
|\ \ \ \ \
| * | | | | Generated code for well-known typesJon Skeet2015-07-1417-113/+4763
| * | | | | Generate the well-known types in C#Jon Skeet2015-07-1414-17/+45
* | | | | | Merge pull request #593 from jskeet/reflection-namespaceJon Skeet2015-07-1449-3355/+3331
|\| | | | |
| * | | | | Changing reflection namespace (part 4)Jon Skeet2015-07-148-11/+0
| * | | | | Changing reflection namespace (part 3)Jon Skeet2015-07-1412-252/+251
| * | | | | Changing reflection namespace (part 2)Jon Skeet2015-07-147-487/+487
| * | | | | Changing reflection namespace (part 1)Jon Skeet2015-07-1432-2638/+2626
|/ / / / /
* | | | | Merge pull request #583 from jskeet/issue312Jon Skeet2015-07-142-3/+11
|\ \ \ \ \
| * | | | | Convert package name to PascalCase for C# namespaceJon Skeet2015-07-142-3/+11
|/ / / / /
* | | | | Merge pull request #582 from jskeet/csharp-jsonJon Skeet2015-07-1421-168/+1494
|\ \ \ \ \
| * | | | | Changes suggested during review.Jon Skeet2015-07-142-27/+4
| * | | | | Fixes to JsonFormatterJon Skeet2015-07-102-11/+112
| * | | | | Generated code changes for previous submitJon Skeet2015-07-107-113/+113
| * | | | | Oneof reflection support. (Generated code changes in next commit.)Jon Skeet2015-07-105-35/+87
| * | | | | Use the new JsonFormatter to implement ToString on generated messages.Jon Skeet2015-07-1010-6/+459