zathura/ft
Moritz Lipp 5e4d584382 Merge branch 'render' into girara
Conflicts:
	Makefile
	config.c
	config.h
	document.c
	ft/djvu/Makefile
	ft/pdf-mupdf/Makefile
	ft/pdf-poppler/Makefile
	render.c
	zathura.c
2011-04-19 21:54:24 +02:00
..
djvu Merge branch 'render' into girara 2011-04-19 21:54:24 +02:00
pdf-mupdf Merge branch 'render' into girara 2011-04-19 21:54:24 +02:00
pdf-poppler Merge branch 'render' into girara 2011-04-19 21:54:24 +02:00
Makefile add .PHONY in Makefile 2011-04-18 11:31:57 +02:00