diff options
| author | Jie Luo <jieluo@google.com> | 2015-04-29 15:55:11 -0700 |
|---|---|---|
| committer | Jie Luo <jieluo@google.com> | 2015-04-29 15:55:11 -0700 |
| commit | 954bc834133289cd7c844ab4195f574223a0e593 (patch) | |
| tree | 70453d4abe66ab04aab861d40a95fe4dd1d5e24c /csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs | |
| parent | 4af18b87117ab463042f90e9d3c00c1bb776bcf7 (diff) | |
| parent | a449f66bdb50f3e898889705945fb1ac6b105469 (diff) | |
| download | protobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.gz protobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.bz2 protobuf-954bc834133289cd7c844ab4195f574223a0e593.zip | |
Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp
Diffstat (limited to 'csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs')
| -rw-r--r-- | csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs index cbab444d..063f6666 100644 --- a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs +++ b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs @@ -65,8 +65,6 @@ using System.Security; [assembly: AssemblyFileVersion("2.4.1.555")]
#endif
-[assembly: CLSCompliant(true)]
-
#if CLIENTPROFILE // ROK - not defined in SL, CF, or PL
[assembly: AllowPartiallyTrustedCallers]
#endif
|