Merge branch 'maint'

Conflicts: scripts/repo-add.sh.in
author: Dan McGee <dan@archlinux.org> 2012-04-24 08:41:46 -0500
committer: Dan McGee <dan@archlinux.org> 2012-04-24 08:44:11 -0500
commit: ca4f8687f7816c283ee2b4a438b28deff3a276d4 (patch)
tree: 17e126e316e422f9610eecbabf39bf1d7d9d0555 /contrib/.gitignore
parent: ac6ebcfe93e8214ad4170caab006ffe5f9abe98d (diff)
parent: 5f71570ec48588bf24bfe786f40b500216084d07 (diff)
1 files changed, 0 insertions, 1 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
author	Dan McGee <dan@archlinux.org>	2012-04-24 08:41:46 -0500
committer	Dan McGee <dan@archlinux.org>	2012-04-24 08:44:11 -0500
commit	ca4f8687f7816c283ee2b4a438b28deff3a276d4 (patch)
tree	17e126e316e422f9610eecbabf39bf1d7d9d0555 /contrib/.gitignore
parent	ac6ebcfe93e8214ad4170caab006ffe5f9abe98d (diff)
parent	5f71570ec48588bf24bfe786f40b500216084d07 (diff)