Commit Graph

1 Commits

Author SHA1 Message Date
Moritz Lipp
3f23dcfb6e Merge branch 'mupdf' into girara
Updated to mupdf 0.8

Conflicts:
	config.mk
	ft/pdf-mupdf/pdf.h
	ft/pdf-poppler/pdf.c
	ft/pdf-poppler/pdf.h
	ft/pdf/pdf.h
2011-03-06 09:43:19 +01:00