summaryrefslogtreecommitdiff
path: root/extra/git/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-14 17:12:15 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-14 17:12:15 +0200
commit6feb300093e37e58027d52ca5734624565e09598 (patch)
tree418d2cc8c7e631c42898a28731ade8a29e3cb955 /extra/git/PKGBUILD
parent216722b262c18f99fa53875247e7a258cb3b4b34 (diff)
parentd3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/openbox/PKGBUILD community/powertop/PKGBUILD core/libusb-compat/PKGBUILD core/openssl/PKGBUILD extra/libvpx/PKGBUILD extra/php-apc/PKGBUILD extra/pidgin/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject/PKGBUILD extra/xfce4-genmon-plugin/PKGBUILD extra/xorg-server/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-cairo/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-libffi/PKGBUILD multilib/lib32-libpulse/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/wine/PKGBUILD testing/mdadm/PKGBUILD testing/php/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-server/git-fixes.patch
Diffstat (limited to 'extra/git/PKGBUILD')
-rw-r--r--extra/git/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 4d6d06c80..0a09ff856 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158077 2012-05-02 14:24:00Z dan $
+# $Id: PKGBUILD 158835 2012-05-12 03:22:50Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.10.1
+pkgver=1.7.10.2
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -99,7 +99,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('870361f93fad7999f121bc7bc91a743feda68bdb'
- '5bff761bc40a6b3cfe35ba824357dcf611dbd5d2'
+sha1sums=('e4b7f746ff4e356baaddcad0b2911376efde031b'
+ '6cc3f80185bdd1a608cf373b05313b2adc82b898'
'f2b41828bd912b72e2cb3e14677739c4f370de66'
'149e2da1ecb48872ddb31c0945afeaad1f9653d7')