diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
| commit | 58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch) | |
| tree | 7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /csharp | |
| parent | 86fcd879b38505446799b2f2a2929415ddad620a (diff) | |
| parent | 57170b93438b25c9c7da9bc53a9545dad261fbcb (diff) | |
| download | protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.gz protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.bz2 protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.zip | |
Merge remote-tracking branch 'origin/3.0.x' into merge
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/Google.Protobuf.Tools.nuspec | 2 | ||||
| -rw-r--r-- | csharp/src/Google.Protobuf/project.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 24b4a776..ce7514b4 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ <title>Google Protocol Buffers tools</title> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <description>See project site for more info.</description> - <version>3.0.0</version> + <version>3.0.2</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl> diff --git a/csharp/src/Google.Protobuf/project.json b/csharp/src/Google.Protobuf/project.json index 9b831f12..607b65ef 100644 --- a/csharp/src/Google.Protobuf/project.json +++ b/csharp/src/Google.Protobuf/project.json @@ -1,5 +1,5 @@ { - "version": "3.0.0", + "version": "3.0.2", "title": "Google Protocol Buffers", "description": "See project site for more info.", "authors": [ "Google Inc." ], |