summaryrefslogtreecommitdiff
path: root/source/fitz
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2015-02-23 15:00:56 +0100
committerTor Andersson <tor.andersson@artifex.com>2015-02-23 15:00:56 +0100
commit119552f74c71c24698f4b424411786bfb4baea6b (patch)
treebf312c79c7fe6fcb819c6f1b8e3cc9f8e4888e0e /source/fitz
parent241f8b6c35895b932ac7f27de1ee76416cae419a (diff)
parentfe05bc51ee70190516d6cc65f03e343bfdc4f849 (diff)
downloadmupdf-119552f74c71c24698f4b424411786bfb4baea6b.tar.xz
Merge branch 'html'
Conflicts: Makefile
Diffstat (limited to 'source/fitz')
-rw-r--r--source/fitz/document-all.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/fitz/document-all.c b/source/fitz/document-all.c
index e1eb4a58..bfe57592 100644
--- a/source/fitz/document-all.c
+++ b/source/fitz/document-all.c
@@ -7,4 +7,6 @@ void fz_register_document_handlers(fz_context *ctx)
fz_register_document_handler(ctx, &cbz_document_handler);
fz_register_document_handler(ctx, &img_document_handler);
fz_register_document_handler(ctx, &tiff_document_handler);
+ fz_register_document_handler(ctx, &html_document_handler);
+ fz_register_document_handler(ctx, &epub_document_handler);
}