-
Moritz Lipp authored
Conflicts: Makefile config.c config.h document.c ft/djvu/Makefile ft/pdf-mupdf/Makefile ft/pdf-poppler/Makefile render.c zathura.c
5e4d5843
Conflicts: Makefile config.c config.h document.c ft/djvu/Makefile ft/pdf-mupdf/Makefile ft/pdf-poppler/Makefile render.c zathura.c