diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-07-26 12:29:03 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-07-26 12:29:03 -0700 |
| commit | 032fb914e205f6a4d59097c4e27a650eb5a21c7b (patch) | |
| tree | 29ad5dbdb37192e46889041e97ad87ceba0299c2 /Makefile.am | |
| parent | 0973822d03992fd818e5424020e6c618f3f33649 (diff) | |
| parent | ba52f2b6780fa5e6bee86cf7e8ee6f6ba617862c (diff) | |
Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9dd749c6..ccbfd065 100644 --- a/Makefile.am +++ b/Makefile.am @@ -705,6 +705,7 @@ ruby_EXTRA_DIST= \ ruby/tests/repeated_field_test.rb \ ruby/tests/stress.rb \ ruby/tests/generated_code.proto \ + ruby/tests/test_import.proto \ ruby/tests/generated_code_test.rb \ ruby/travis-test.sh |