summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-04-01 22:14:58 -0500
committerDan McGee <dan@archlinux.org>2008-04-01 22:14:58 -0500
commit073bac794d7643fae21dacbe3d5c1585ce347bea (patch)
treecbde848a0a5ab30251ff0c2cf4bf9c9ccea760d0 /contrib
parent0bd6fb3bc28b395d5af099221e2c0401d3be42e2 (diff)
parent0b8abf376f4a34d18aed450642284d9410522667 (diff)
downloadpacman-073bac794d7643fae21dacbe3d5c1585ce347bea.tar.xz
Merge branch 'maint'
Conflicts: configure.ac contrib/Makefile.am
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile.am2
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