summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-24 08:41:46 -0500
committerDan McGee <dan@archlinux.org>2012-04-24 08:44:11 -0500
commitca4f8687f7816c283ee2b4a438b28deff3a276d4 (patch)
tree17e126e316e422f9610eecbabf39bf1d7d9d0555 /contrib
parentac6ebcfe93e8214ad4170caab006ffe5f9abe98d (diff)
parent5f71570ec48588bf24bfe786f40b500216084d07 (diff)
downloadpacman-ca4f8687f7816c283ee2b4a438b28deff3a276d4.tar.xz
Merge branch 'maint'
Conflicts: scripts/repo-add.sh.in
Diffstat (limited to 'contrib')
-rw-r--r--contrib/.gitignore1
-rw-r--r--contrib/Makefile.am1
2 files changed, 0 insertions, 2 deletions
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 19b81e00..70d19093 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -7,5 +7,4 @@ paclog-pkglist
pacscripts
pacsearch
pacsysclean
-wget-xdelta.sh
zsh_completion
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index eca39e75..a3d2d42b 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -83,7 +83,6 @@ paclog-pkglist: $(srcdir)/paclog-pkglist.in
pacscripts: $(srcdir)/pacscripts.in
pacsearch: $(srcdir)/pacsearch.in
pacsysclean: $(srcdir)/pacsysclean.in
-pactree: $(srcdir)/pactree.in
zsh_completion: $(srcdir)/zsh_completion.in
# vim:set ts=2 sw=2 noet: