diff options
| author | Dan McGee <dan@archlinux.org> | 2012-07-10 15:41:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-07-10 15:41:18 +0200 |
| commit | e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (patch) | |
| tree | cca5ca8e117ab536055696cba83960566b36f661 /doc/Makefile.am | |
| parent | 392fffe24126c1d0404ead75c1743411fe65310a (diff) | |
| parent | 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff) | |
| download | pacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.gz pacman-e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8.tar.xz | |
Merge branch 'maint'
Conflicts:
etc/makepkg.conf.in
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index e6ed29c0..bcb05b74 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,6 +10,7 @@ ASCIIDOC_MANS = \ vercmp.8 \ pkgdelta.8 \ pacman-key.8 \ + pactree.8 \ PKGBUILD.5 \ makepkg.conf.5 \ pacman.conf.5 \ @@ -24,6 +25,7 @@ HTML_MANPAGES = \ vercmp.8.html \ pkgdelta.8.html \ pacman-key.8.html \ + pactree.8.html \ PKGBUILD.5.html \ makepkg.conf.5.html \ pacman.conf.5.html \ @@ -48,6 +50,7 @@ EXTRA_DIST = \ vercmp.8.txt \ pkgdelta.8.txt \ pacman-key.8.txt \ + pactree.8.txt \ PKGBUILD.5.txt \ PKGBUILD-example.txt \ makepkg.conf.5.txt \ @@ -148,6 +151,7 @@ repo-add.8 repo-add.8.html: repo-add.8.txt vercmp.8 vercmp.8.html: vercmp.8.txt pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt pacman-key.8 pacman-key.8.html: pacman-key.8.txt +pactree.8 pactree.8.html: pactree.8.txt PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt |