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 /ios/Icon@2x.png | |
| 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 'ios/Icon@2x.png')
| -rw-r--r-- | ios/Icon@2x.png | bin | 0 -> 16336 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/ios/Icon@2x.png b/ios/Icon@2x.png Binary files differnew file mode 100644 index 00000000..c62a076d --- /dev/null +++ b/ios/Icon@2x.png |