| commit | 44887ae59f1539c8c087d014b861ac567da62e3f | [log] [tgz] |
|---|---|---|
| author | Eugene Kliuchnikov <eustas@google.com> | Wed Sep 19 16:31:22 2018 +0200 |
| committer | Eugene Kliuchnikov <eustas@google.com> | Wed Sep 19 16:31:22 2018 +0200 |
| tree | 5bf20950fdef7f0c53bc68dfaa9f02d7b6a4c4d7 | |
| parent | 50e71c2b4c0772f025fecac6a73dd7a0050ec6a7 [diff] | |
| parent | 227bb81247998e67e4402951f24c13c9f2f90605 [diff] |
Merge branch 'shared-brotli' of https://github.com/google/brotli into shared-brotli # Conflicts: # c/enc/backward_references.c # c/enc/encoder_dict.c # c/enc/encoder_dict.h # docs/decode.h.3 # java/org/brotli/wrapper/enc/Encoder.java # java/org/brotli/wrapper/enc/EncoderJNI.java # java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java