diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
tree | 0f63651432b8448262549265a5420fff1ab665e8 /extra/vim | |
parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/vim')
-rw-r--r-- | extra/vim/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 36af94236..fc79496e7 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160931 2012-06-07 03:39:59Z tdziedzic $ +# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=547 -__hgrev=6f2497d0c277 +_patchlevel=600 +__hgrev=11d40fc82f11 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('2c4f78a66b6ad7a759122d1f66c74079b678f39c' - '999f527d82a4c7818d017e3b8230e27950e87718' +sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda' + '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' |