| commit | 5d0c2ee3657d4b530cd547f132f5425debfa0a0e | [log] [tgz] |
|---|---|---|
| author | Thomas Van Lenten <thomasvl@google.com> | Tue May 24 11:31:42 2016 -0400 |
| committer | Thomas Van Lenten <thomasvl@google.com> | Tue May 24 11:31:42 2016 -0400 |
| tree | e616c46dc8706e0669cb4952948dfd52cb3fe200 | |
| parent | 173daf120ae2782f6795065d0a25623952729378 [diff] | |
| parent | 7da023b892ccd7135b6c9762d7618ccf414a4cd7 [diff] |
Merge pull request #1593 from thomasvl/framework_includes Better support for using the proto library from a framework.
diff --git a/Makefile.am b/Makefile.am index 3e98881..31ca9a1 100644 --- a/Makefile.am +++ b/Makefile.am
@@ -675,6 +675,7 @@ js/binary/constants.js \ js/binary/decoder.js \ js/binary/decoder_test.js \ + js/binary/encoder.js \ js/binary/proto_test.js \ js/binary/reader.js \ js/binary/reader_test.js \