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/git | |
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/git')
-rw-r--r-- | extra/git/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 317253296..47f7b8241 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162371 2012-06-26 03:37:25Z dan $ +# $Id: PKGBUILD 163497 2012-07-13 14:43:17Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.11.1 +pkgver=1.7.11.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('d09664978931d215e43241689eb09371b509c7ce' - 'e2defbf75ff15d7684d70457e41bc45fb22f0e1f' +sha1sums=('f67b4f6c0277250411c6872ae7b8a872ae11d313' + '78b46ca7b5037c61a58086879869dadeac9eea3e' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') |