commit 284bb452e48a3cf3346f00b0ea5579d8fe854573
author Jon Skeet <jonskeet@google.com> Thu Nov 05 09:13:53 2015 +0000
committer Jon Skeet <jonskeet@google.com> Mon Nov 09 09:22:45 2015 +0000
tree 69fb9f4b6e11543f8121438522f4ef541837eade
parent 61a50b9e6b3c2898eb1446230f3ed74f9c8be7f9

Generated code changes and manual changes for previous commit.

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0a26fa1..858e4dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,9 +130,9 @@
   csharp/src/Google.Protobuf/MessageParser.cs                                \
   csharp/src/Google.Protobuf/Preconditions.cs                                \
   csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs                      \
+  csharp/src/Google.Protobuf/Reflection/Descriptor.cs                        \
   csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs                    \
   csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs               \
   csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs                    \
   csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs     \
   csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs                    \