diff options
| author | piernov <piernov@piernov.org> | 2012-04-26 03:42:13 +0000 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-04-26 03:42:13 +0000 |
| commit | ec1b754278e5e5c438ced13c588b9b6c0c3a4c24 (patch) | |
| tree | b4ea22cdc2abd9e6493a1d1d2ba212b4d194d814 /git/.footprint.i686 | |
| parent | b3db12149fa5c063c11c318e89b2bd1303af191e (diff) | |
| download | nutyx-extra-ec1b754278e5e5c438ced13c588b9b6c0c3a4c24.tar.gz nutyx-extra-ec1b754278e5e5c438ced13c588b9b6c0c3a4c24.tar.bz2 nutyx-extra-ec1b754278e5e5c438ced13c588b9b6c0c3a4c24.tar.xz nutyx-extra-ec1b754278e5e5c438ced13c588b9b6c0c3a4c24.zip | |
git 1.7.10-1 màj port
Diffstat (limited to 'git/.footprint.i686')
| -rw-r--r-- | git/.footprint.i686 | 1 |
1 files changed, 1 insertions, 0 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 |