diff options
| author | Dan McGee <dan@archlinux.org> | 2008-04-02 05:14:58 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-04-02 05:14:58 +0200 |
| commit | 073bac794d7643fae21dacbe3d5c1585ce347bea (patch) | |
| tree | cbde848a0a5ab30251ff0c2cf4bf9c9ccea760d0 /contrib | |
| parent | 0bd6fb3bc28b395d5af099221e2c0401d3be42e2 (diff) | |
| parent | 0b8abf376f4a34d18aed450642284d9410522667 (diff) | |
| download | pacman-073bac794d7643fae21dacbe3d5c1585ce347bea.tar.gz pacman-073bac794d7643fae21dacbe3d5c1585ce347bea.tar.xz | |
Merge branch 'maint'
Conflicts:
configure.ac
contrib/Makefile.am
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 7654848f..7eee91a1 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = \ pacsearch \ re-pacman \ updatesync \ - vimproject \ + vimprojects \ wget-xdelta.sh \ zsh_completion \ README |