diff options
author | Juergen Daubert <jue@jue.li> | 2017-02-17 13:09:24 +0100 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2017-02-17 13:09:24 +0100 |
commit | d0ca97dc99504dbd8ccc861a53cb9cf386031c63 (patch) | |
tree | 9de9cd24dfa753d26cf2b30998ed3ba624b6251d /poppler/Pkgfile | |
parent | 9f8485a39818c82102f379ac3643594d0f9baa15 (diff) | |
parent | c1c8a472a14111e31d74b8bc23dee29c1aaeea73 (diff) | |
download | opt-d0ca97dc99504dbd8ccc861a53cb9cf386031c63.tar.gz opt-d0ca97dc99504dbd8ccc861a53cb9cf386031c63.tar.xz |
Merge branch '3.2' into 3.3
Conflicts:
poppler-glib/.md5sum
poppler-qt4/.md5sum
poppler/.md5sum
python-pyparsing/Pkgfile
python-setuptools/Pkgfile
xsane/Pkgfile
Diffstat (limited to 'poppler/Pkgfile')
-rw-r--r-- | poppler/Pkgfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/poppler/Pkgfile b/poppler/Pkgfile index 866c96193..0c42238b3 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake cairo lcms2 name=poppler -version=0.51.0 +version=0.52.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz poppler-cmake.patch) |