aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-09-14 09:37:48 -0700
commit58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch)
tree7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /csharp/src/Google.Protobuf
parent86fcd879b38505446799b2f2a2929415ddad620a (diff)
parent57170b93438b25c9c7da9bc53a9545dad261fbcb (diff)
downloadprotobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.gz
protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.bz2
protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.zip
Merge remote-tracking branch 'origin/3.0.x' into merge
Diffstat (limited to 'csharp/src/Google.Protobuf')
-rw-r--r--csharp/src/Google.Protobuf/project.json2
1 files changed, 1 insertions, 1 deletions
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." ],