diff options
| author | Robin Watts <robin.watts@artifex.com> | 2011-11-14 18:22:13 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2011-11-15 15:20:54 +0000 |
| commit | 9c0a49060475b2dea1e4c2668bebd1d566113a7b (patch) | |
| tree | 49e45a691cf105f4266d5c6b7242a4a3256c1200 /win32 | |
| parent | 60c0544742931da63db623ad7a79ba3758704cc1 (diff) | |
| parent | fd6def85f22b598d4c278e76138ab7dccbb84c36 (diff) | |
| download | mupdf-9c0a49060475b2dea1e4c2668bebd1d566113a7b.tar.xz | |
Merge branch 'master' into context
Mostly redoing the xps_context to xps_document change and adding
contexts to newly written code.
Conflicts:
apps/pdfapp.c
apps/pdfapp.h
apps/x11_main.c
apps/xpsdraw.c
draw/draw_device.c
draw/draw_scale.c
fitz/base_object.c
fitz/fitz.h
pdf/mupdf.h
pdf/pdf_interpret.c
pdf/pdf_outline.c
pdf/pdf_page.c
xps/muxps.h
xps/xps_doc.c
xps/xps_xml.c
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/libmupdf.vcproj | 10 | ||||
| -rw-r--r-- | win32/mupdf.vcproj | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj index 3abe1fa2..52977dca 100644 --- a/win32/libmupdf.vcproj +++ b/win32/libmupdf.vcproj @@ -411,6 +411,10 @@ > </File> <File + RelativePath="..\fitz\doc_outline.c" + > + </File> + <File RelativePath="..\fitz\filt_basic.c" > </File> @@ -539,7 +543,7 @@ > </File> <File - RelativePath="..\draw\draw_scale.c" + RelativePath="..\draw\draw_simple_scale.c" > </File> <File @@ -579,6 +583,10 @@ > </File> <File + RelativePath="..\xps\xps_outline.c" + > + </File> + <File RelativePath="..\xps\xps_path.c" > </File> diff --git a/win32/mupdf.vcproj b/win32/mupdf.vcproj index 9de7ca25..c61cb34d 100644 --- a/win32/mupdf.vcproj +++ b/win32/mupdf.vcproj @@ -241,6 +241,10 @@ > </File> <File + RelativePath="..\apps\pdfapp.h" + > + </File> + <File RelativePath="..\apps\win_main.c" > </File> |