summaryrefslogtreecommitdiff
path: root/extra/git
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-03-14 10:24:35 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-03-14 10:24:35 +0100
commita4f3ca8891e50241ac2ca144949e92b26920ffaf (patch)
treed31841075429e437c4908580e8ec074f2fe40aa5 /extra/git
parent3156702a5deccd61451be9f7d8ba0fd212a3043b (diff)
parent01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/aspell-ca/PKGBUILD community/corkscrew/PKGBUILD cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/libxi/PKGBUILD extra/mesa/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/mpc/PKGBUILD extra/poppler/PKGBUILD extra/xf86-video-siliconmotion/PKGBUILD extra/xorg-server/PKGBUILD gnome-unstable/gconf/PKGBUILD gnome-unstable/gnome-desktop/PKGBUILD gnome-unstable/network-manager-applet/PKGBUILD gnome-unstable/vte3/PKGBUILD multilib/chuck/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD multilib/lib32-libx11/PKGBUILD multilib/lib32-libxcb/PKGBUILD multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch multilib/lib32-libxft/PKGBUILD multilib/lib32-libxi/PKGBUILD multilib/lib32-llvm/PKGBUILD multilib/lib32-mesa/PKGBUILD testing/grep/PKGBUILD testing/sudo/PKGBUILD testing/xf86-input-joystick/PKGBUILD testing/xf86-input-wacom/PKGBUILD
Diffstat (limited to 'extra/git')
-rw-r--r--extra/git/PKGBUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 8b4ef487a..9a99d37db 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 152269 2012-03-06 12:08:41Z dan $
+# $Id: PKGBUILD 153414 2012-03-13 02:15:42Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.9.3
+pkgver=1.7.9.4
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -92,7 +92,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('6216153da1139c25cb96cfb4441eff327013ec4f'
- '223daa871a64facc60bdf643c50c78eac21c88f4'
+sha1sums=('05d2ff75ffd3356516d096f992b4fb3b8b6c0079'
+ '833dc143d2d296754d681c57b41a008ff433b225'
'f2b41828bd912b72e2cb3e14677739c4f370de66'
'149e2da1ecb48872ddb31c0945afeaad1f9653d7')