Merge branch 'master' of git://github.com/joeyh/ikiwiki

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2f11069c691acb8d1bc3e43d1bfec915aa618898..48780ae51d137fd20aba4f369817c93762035bb6 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -344,7 +344,7 @@ sub getsetup () {
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                        qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
-                       qr/\.dpkg-tmp$/],
+                       qr/(^|\/)CVS\//, qr/\.dpkg-tmp$/],
                description => "regexps of source files to ignore",
                safe => 0,
                rebuild => 1,