diff options
| author | Jisi Liu <liujisi@google.com> | 2018-01-04 14:26:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 14:26:24 -0800 |
| commit | a3868af12be724f808faa21a29e7b4931e30bed1 (patch) | |
| tree | 3df23c4174287023b569108eb133db0f9c310646 /Makefile.am | |
| parent | eca1d2a7113b3d57f900f69661342c0078c956c4 (diff) | |
| parent | ec826c5a592126ddb6b12b47e6e1fb6232ce340d (diff) | |
| download | protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.gz protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.bz2 protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.zip | |
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
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 74fab324..d392429f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -926,6 +926,7 @@ ruby_EXTRA_DIST= \ ruby/src/main/java/google/ProtobufJavaService.java \ ruby/src/main/sentinel.proto \ ruby/tests/basic.rb \ + ruby/tests/encode_decode_test.rb \ ruby/tests/gc_test.rb \ ruby/tests/repeated_field_test.rb \ ruby/tests/stress.rb \ |