Juergen Daubert d0ca97dc99 Merge branch '3.2' into 3.3 ... Conflicts: poppler-glib/.md5sum poppler-qt4/.md5sum poppler/.md5sum python-pyparsing/Pkgfile python-setuptools/Pkgfile xsane/Pkgfile		2017-02-17 13:09:24 +01:00
..
.footprint	poppler-glib: use cmake build system	2017-01-01 13:34:15 +01:00
.md5sum	Merge branch '3.2' into 3.3	2017-02-17 13:09:24 +01:00
.signature	Merge branch '3.2' into 3.3	2017-02-17 13:09:24 +01:00
Pkgfile	Merge branch '3.2' into 3.3	2017-02-17 13:09:24 +01:00
poppler-cmake.patch	poppler-glib: use cmake build system	2017-01-01 13:34:15 +01:00