diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
| commit | 4465daa57a4b6910965e9d078ae125ddb9ee8c21 (patch) | |
| tree | e6d5096e6a2a5523d2b1975f6248cd9d8f8957ce /src/Makefile.am | |
| parent | 15239361e31d53c10b918aa9fe8ce057155588b4 (diff) | |
| parent | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (diff) | |
| download | protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.gz protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.bz2 protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.zip | |
Merge branch 'master' into internal-merge
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 073673a5..2ba0ef9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -455,6 +455,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/csharp/csharp_message.h \ google/protobuf/compiler/csharp/csharp_message_field.cc \ google/protobuf/compiler/csharp/csharp_message_field.h \ + google/protobuf/compiler/csharp/csharp_options.h \ google/protobuf/compiler/csharp/csharp_primitive_field.cc \ google/protobuf/compiler/csharp/csharp_primitive_field.h \ google/protobuf/compiler/csharp/csharp_reflection_class.cc \ |