diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
| commit | b457cd831ad519d5ec023005ba6ccfb52ff4c9cb (patch) | |
| tree | 75575c3da2adaf0e44a382558428b0eb47f5ab43 /src/csharp/Grpc.Core/Version.cs | |
| parent | f0b417dc84d52ebd3890751b0ee331f9eee49e37 (diff) | |
| parent | 73578f7f62df4fd03035ad8e04c43b492649a064 (diff) | |
Merge remote-tracking branch 'google/master' into the-ultimate-showdown
Conflicts:
src/csharp/ext/grpc_csharp_ext.c
Diffstat (limited to 'src/csharp/Grpc.Core/Version.cs')
| -rw-r--r-- | src/csharp/Grpc.Core/Version.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Version.cs b/src/csharp/Grpc.Core/Version.cs index b5cb652945..d2a029fbb4 100644 --- a/src/csharp/Grpc.Core/Version.cs +++ b/src/csharp/Grpc.Core/Version.cs @@ -2,4 +2,4 @@ using System.Reflection; using System.Runtime.CompilerServices; // The current version of gRPC C#. -[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentVersion + ".*")] +[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentVersion + ".0")] |