Merge branch 'erp5' into vifib

91b71cc3 · Łukasz Nowak · 46f0f8f1 · c3a2a846 · 91b71cc3
Commit 91b71cc3 authored Jun 13, 2011 by Łukasz Nowak
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

component/poppler/buildout.cfg component/poppler/buildout.cfg +1 -1

No files found.
--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
 [buildout]
-parts = xpdf
+parts = poppler

 [poppler]
 <= poppler-0.17.1