diff options
| author | Dan McGee <dan@archlinux.org> | 2012-07-10 08:41:18 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-07-10 08:41:18 -0500 |
| commit | e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (patch) | |
| tree | cca5ca8e117ab536055696cba83960566b36f661 /doc/.gitignore | |
| parent | 392fffe24126c1d0404ead75c1743411fe65310a (diff) | |
| parent | 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff) | |
Merge branch 'maint'
Conflicts:
etc/makepkg.conf.in
Diffstat (limited to 'doc/.gitignore')
| -rw-r--r-- | doc/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/.gitignore b/doc/.gitignore index 5625735a..a96ddb30 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -5,6 +5,7 @@ makepkg.conf.5 pacman.8 pacman-key.8 pacman.conf.5 +pactree.8 pkgdelta.8 repo-add.8 repo-remove.8 |