Skip to content
  • Moritz Lipp's avatar
    Merge branch 'render' into girara · 5e4d5843
    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