diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
| commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
| tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /extra/git | |
| parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
| parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.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 8e4800ce4..6d656782a 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160199 2012-05-30 18:30:33Z dan $ +# $Id: PKGBUILD 160963 2012-06-07 14:20:24Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.10.3 +pkgver=1.7.10.4 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=('172c6ad5a55276213c5e40b83a4c270f6f931b3e' - '4ae4f9f0f0dc42ad5cb2de309049c953841bc413' +sha1sums=('ddc305ab520246790faa72bbaab4b9bf5bcf23fa' + '0769f6ff48d89df908cfe2af85fb4072b4178746' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') |