Commit Graph

4 Commits

Author SHA1 Message Date
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
Sebastian Ramacher
8025225e14 create dependencies 2011-04-19 18:53:41 +02:00
Sebastian Ramacher
a98f69c3f3 add .PHONY in Makefile 2011-04-18 11:31:57 +02:00
Moritz Lipp
ff4df5e385 Renamed pdf poppler plugin 2011-03-06 09:22:38 +01:00