diff options
author | Michael Vogt <mvo@debian.org> | 2013-12-07 17:54:11 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-12-07 17:54:11 +0100 |
commit | 8fafb8adc032002284f53359e1308efa609f9239 (patch) | |
tree | 2348ae1953446a069c0e44bcd20915c22c4d89b1 /doc/makefile | |
parent | bc435af429f427c6a5db971c3d4cc7f15a2fe55d (diff) | |
parent | ce34af08ad6866869147e3525fa6c89d8dcb4601 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
debian/gbp.conf
Diffstat (limited to 'doc/makefile')
-rw-r--r-- | doc/makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/makefile b/doc/makefile index 49f3e1b56..4b63e542f 100644 --- a/doc/makefile +++ b/doc/makefile @@ -28,7 +28,7 @@ include $(COPY_H) clean: clean/subdirs clean/examples veryclean: veryclean/subdirs clean/examples -manpages: manpages/subdirs apt-vendor.ent +manpages: apt-vendor.ent manpages/subdirs debiandoc: debiandoc/subdirs DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) |