aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
diff options
context:
space:
mode:
authorJie Luo <jieluo@google.com>2015-04-30 11:23:09 -0700
committerJie Luo <jieluo@google.com>2015-04-30 11:23:09 -0700
commit24ae5105f3bd44d39303d7e76edb659cca01f97b (patch)
treebeb5264eca24e47d4912f35a8b4b12b8978c07f6 /csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
parent954bc834133289cd7c844ab4195f574223a0e593 (diff)
parent0884b77975146be5d0557b254fbeab940cda641a (diff)
downloadprotobuf-24ae5105f3bd44d39303d7e76edb659cca01f97b.tar.gz
protobuf-24ae5105f3bd44d39303d7e76edb659cca01f97b.tar.bz2
protobuf-24ae5105f3bd44d39303d7e76edb659cca01f97b.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.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
index 063f6666..806bd5d5 100644
--- a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
+++ b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs
@@ -65,6 +65,3 @@ using System.Security;
[assembly: AssemblyFileVersion("2.4.1.555")]
#endif
-#if CLIENTPROFILE // ROK - not defined in SL, CF, or PL
-[assembly: AllowPartiallyTrustedCallers]
-#endif