diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-01 15:49:11 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-01 15:49:11 -0800 |
| commit | 5702859df047cfe42c1ad64b65146600917709a0 (patch) | |
| tree | cb849a4eedf39952ec4856defbefa2ed5fb61711 /third_party/libopenjpeg20/t1.h | |
| parent | 05797682103f8c724bc21fa197ee6f9f6515081e (diff) | |
| download | pdfium-5702859df047cfe42c1ad64b65146600917709a0.tar.xz | |
Merge to XFA: Tidy up CPDF_DocEnvironment::JS_* methods
One trivial conflict in fsdk_mgr.h
Review URL: https://codereview.chromium.org/1658853002 .
(cherry picked from commit 1654972e0c81f1841653f803903cc48b93f1738e)
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1651313002 .
Diffstat (limited to 'third_party/libopenjpeg20/t1.h')
0 files changed, 0 insertions, 0 deletions