diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
commit | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch) | |
tree | 45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /Makefile.am | |
parent | 8529f2aee33ae793c9ce362a45370b98f675370a (diff) | |
parent | 88e5573b9a8a5c4038f9db3633610f032aab277d (diff) | |
download | protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.gz protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.bz2 protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.zip |
Merge remote-tracking branch 'origin/3.5.x' 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 \ |