diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-15 14:36:02 -0300 |
commit | 5f5cc752e0a87d0ccd031eaf01ca2b63f303e00c (patch) | |
tree | d96687d0c40dec64bacc8b82afbd024b781a9591 /extra/imagemagick | |
parent | 2a5d7fae98236635f0b42f281b98c7fa878651b2 (diff) | |
parent | f96b67a7733c348213a216ba6472d43614b44f04 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-x11-xft/PKGBUILD
community/xmobar/PKGBUILD
core/pcre/PKGBUILD
core/texinfo/PKGBUILD
extra/ettercap/PKGBUILD
libre/initscripts/PKGBUILD
Diffstat (limited to 'extra/imagemagick')
-rw-r--r-- | extra/imagemagick/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 460ba2ff8..25fa6b756 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143601 2011-11-27 03:03:13Z eric $ +# $Id: PKGBUILD 144992 2011-12-13 18:04:12Z eric $ # Maintainer: Eric BĂ©langer <eric@archlinux.org> pkgbase=imagemagick |