diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-24 13:37:15 -0300 |
| commit | aa59a87bb8860445bb3a4b233b44812b65b8c363 (patch) | |
| tree | 2c86c94b07d2205834540b0d4c8ead7f264f56d5 /extra/vim | |
| parent | eca1d6fadc95df0eab55f607f67e69ff5329f590 (diff) | |
| parent | 120df4e0db159525806a9b33364483e76f9d51d3 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/catalyst-dkms/PKGBUILD
community-testing/catalyst-dkms/catalyst.install
community-testing/lxdm/PKGBUILD
community-testing/lxdm/lxdm-pam
extra/tdb/PKGBUILD
extra/usbview/PKGBUILD
multilib/lib32-libldap/PKGBUILD
testing/bison/PKGBUILD
testing/ekiga/PKGBUILD
testing/evince/PKGBUILD
testing/gthumb/PKGBUILD
testing/nautilus/PKGBUILD
testing/opal/PKGBUILD
testing/opal/opal-ffmpeg.patch
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/openssh/sshdgenkeys.service
testing/yelp/PKGBUILD
Diffstat (limited to 'extra/vim')
| -rw-r--r-- | extra/vim/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/vim/vimrc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 25e015e13..95d3391de 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $ +# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z 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=709 -__hgrev=06e088d016ad +_patchlevel=712 +__hgrev=57e8b75298d6 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,10 +21,10 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('7a42c72b07e8bfe6795197a303b21d53' - '5c5723f3c39aaa716bd868d7edf9f563' +md5sums=('368435a6494a2559565ce4d668c4513c' + '1613bbbd2a794cd321db09c6cfe2d35f' '6e7adfbd5d26c1d161030ec203a7f243' - 'e57777374891063b9ca48a1fe392ac05' + '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' 'd90413bd21f400313a785bb4010120cd') diff --git a/extra/vim/vimrc b/extra/vim/vimrc index 92d3ff980..fc18d2d5b 100644 --- a/extra/vim/vimrc +++ b/extra/vim/vimrc @@ -11,6 +11,6 @@ runtime! archlinux.vim " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual " and configure vim to your own liking! |