diff options
| author | piernov <piernov@piernov.org> | 2012-04-30 16:12:14 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-04-30 16:12:14 +0200 |
| commit | 29dcc314053a16e310f6ad99b5fc4d7d0ff50f0a (patch) | |
| tree | b8ca41b54524106de45ba17130897d9a5578f92c /git | |
| parent | 49f3e355f0a4622ec460af6a2291559080e21cfc (diff) | |
| parent | 7ac944e79a5e9fbe76ec9af9c38c163d8c540c6b (diff) | |
| download | nutyx-extra-29dcc314053a16e310f6ad99b5fc4d7d0ff50f0a.tar.gz nutyx-extra-29dcc314053a16e310f6ad99b5fc4d7d0ff50f0a.tar.bz2 nutyx-extra-29dcc314053a16e310f6ad99b5fc4d7d0ff50f0a.tar.xz nutyx-extra-29dcc314053a16e310f6ad99b5fc4d7d0ff50f0a.zip | |
Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-extra
Diffstat (limited to 'git')
| -rw-r--r-- | git/.footprint.i686 | 1 | ||||
| -rw-r--r-- | git/.footprint.x86_64 | 1 | ||||
| -rw-r--r-- | git/.md5sum.i686 | 4 | ||||
| -rw-r--r-- | git/.md5sum.x86_64 | 4 | ||||
| -rw-r--r-- | git/Pkgfile | 2 |
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) |