diff options
| author | Dan McGee <dan@archlinux.org> | 2010-12-30 16:41:46 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-12-30 16:41:46 +0100 |
| commit | 08d885fda5c9ccb3ac68faccc7c75e440ac71113 (patch) | |
| tree | 3c494d8c593db3848d88a74b4e111710acfe0707 /doc | |
| parent | 351250adb49bea470b88fca54dcfba789b58545c (diff) | |
| parent | 6ddc115c7f52d6d172ca3879f96cc782bb526313 (diff) | |
| download | pacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.gz pacman-08d885fda5c9ccb3ac68faccc7c75e440ac71113.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
test/pacman/tests/ignore007.py
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 748eb5fc..6405cf01 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,7 +52,7 @@ EXTRA_DIST = \ $(DOXYGEN_MANS) # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 +MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 website.tar.gz # Ensure manpages are fresh when building a dist tarball dist-hook: |