diff options
| author | piernov <piernov@piernov.org> | 2012-04-26 03:42:13 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-05-13 16:23:05 +0200 |
| commit | 365cd0087b434e68061594bdc62b21527b232143 (patch) | |
| tree | 6212194ae82aa3b6c76782d61b621d935f4db492 /git/.footprint.x86_64 | |
| parent | 5864fdea35034ffa4aa3fcd4971bec760440d6be (diff) | |
| download | nutyx-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/.footprint.x86_64')
| -rw-r--r-- | git/.footprint.x86_64 | 1 |
1 files changed, 1 insertions, 0 deletions
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 |