diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-22 12:29:21 -0700 |
commit | b208774174e102da9f218d89bf8a3af7a0e37f09 (patch) | |
tree | b2f345fb8c42b54008af9e06bcde1cfeff380acb /core/include/fpdfapi/fpdf_resource.h | |
parent | 8f608d9c0d09ab5fc19cfb4a9d5d8ccef3de6625 (diff) | |
download | pdfium-b208774174e102da9f218d89bf8a3af7a0e37f09.tar.xz |
Merge to XFA: Add missing operators for CFX_xxxString combo patch.
This pulls in:
Review URL: https://codereview.chromium.org/1099193002
Review URL: https://codereview.chromium.org/1090303003
Review URL: https://codereview.chromium.org/1084293003
Review URL: https://codereview.chromium.org/1099213002
Plus one fix to an XFA file to fix compilation.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1095893005
Diffstat (limited to 'core/include/fpdfapi/fpdf_resource.h')
0 files changed, 0 insertions, 0 deletions