summaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-04-26 03:42:13 +0000
committerpiernov <piernov@piernov.org>2012-05-13 16:23:05 +0200
commit365cd0087b434e68061594bdc62b21527b232143 (patch)
tree6212194ae82aa3b6c76782d61b621d935f4db492 /git
parent5864fdea35034ffa4aa3fcd4971bec760440d6be (diff)
downloadnutyx-extra-365cd0087b434e68061594bdc62b21527b232143.tar.gz
nutyx-extra-365cd0087b434e68061594bdc62b21527b232143.tar.bz2
nutyx-extra-365cd0087b434e68061594bdc62b21527b232143.tar.xz
nutyx-extra-365cd0087b434e68061594bdc62b21527b232143.zip
git 1.7.10-1 màj port
(cherry picked from commit ec1b754278e5e5c438ced13c588b9b6c0c3a4c24)
Diffstat (limited to 'git')
-rw-r--r--git/.footprint.i6861
-rw-r--r--git/.footprint.x86_641
-rw-r--r--git/.md5sum.i6864
-rw-r--r--git/.md5sum.x86_644
-rw-r--r--git/Pkgfile2
5 files changed, 7 insertions, 5 deletions
diff --git a/git/.footprint.i686 b/git/.footprint.i686
index 5ddea17df..a05253ea5 100644
--- a/git/.footprint.i686
+++ b/git/.footprint.i686
@@ -174,6 +174,7 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/
-rw-r--r-- root/root usr/lib/git-core/mergetools/araxis
-rw-r--r-- root/root usr/lib/git-core/mergetools/bc3
-rw-r--r-- root/root usr/lib/git-core/mergetools/defaults
+-rw-r--r-- root/root usr/lib/git-core/mergetools/deltawalker
-rw-r--r-- root/root usr/lib/git-core/mergetools/diffuse
-rw-r--r-- root/root usr/lib/git-core/mergetools/ecmerge
-rw-r--r-- root/root usr/lib/git-core/mergetools/emerge
diff --git a/git/.footprint.x86_64 b/git/.footprint.x86_64
index 5ddea17df..a05253ea5 100644
--- a/git/.footprint.x86_64
+++ b/git/.footprint.x86_64
@@ -174,6 +174,7 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/
-rw-r--r-- root/root usr/lib/git-core/mergetools/araxis
-rw-r--r-- root/root usr/lib/git-core/mergetools/bc3
-rw-r--r-- root/root usr/lib/git-core/mergetools/defaults
+-rw-r--r-- root/root usr/lib/git-core/mergetools/deltawalker
-rw-r--r-- root/root usr/lib/git-core/mergetools/diffuse
-rw-r--r-- root/root usr/lib/git-core/mergetools/ecmerge
-rw-r--r-- root/root usr/lib/git-core/mergetools/emerge
diff --git a/git/.md5sum.i686 b/git/.md5sum.i686
index 383ae774f..2c93b83be 100644
--- a/git/.md5sum.i686
+++ b/git/.md5sum.i686
@@ -1,2 +1,2 @@
-f1e32b2ec841219e442db9c9ef21c252 git-1.7.9.4.tar.gz
-24d6a551c344af67d93ea2d52f36ef78 git-manpages-1.7.9.4.tar.gz
+ab2716db51580037c7ebda4c8e9d56eb git-1.7.10.tar.gz
+5066600fe67986acd36c008c876e9489 git-manpages-1.7.10.tar.gz
diff --git a/git/.md5sum.x86_64 b/git/.md5sum.x86_64
index 383ae774f..2c93b83be 100644
--- a/git/.md5sum.x86_64
+++ b/git/.md5sum.x86_64
@@ -1,2 +1,2 @@
-f1e32b2ec841219e442db9c9ef21c252 git-1.7.9.4.tar.gz
-24d6a551c344af67d93ea2d52f36ef78 git-manpages-1.7.9.4.tar.gz
+ab2716db51580037c7ebda4c8e9d56eb git-1.7.10.tar.gz
+5066600fe67986acd36c008c876e9489 git-manpages-1.7.10.tar.gz
diff --git a/git/Pkgfile b/git/Pkgfile
index b5b6e167e..e53321a0a 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -6,7 +6,7 @@
# Run on: curl,libidn,expat
name=git
-version=1.7.9.4
+version=1.7.10
release=1
source=(http://git-core.googlecode.com/files/$name-{,manpages-}$version.tar.gz)