diff options
| author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
| commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
| tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /IkiWiki.pm | |
| parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
| parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 63da5d0dd..d0cfb2d57 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -321,7 +321,7 @@ sub getsetup () { default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./, qr/\.x?html?$/, qr/\.ikiwiki-new$/, qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//, - qr/(^|\/)_MTN\//, + qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//, qr/\.dpkg-tmp$/], description => "regexps of source files to ignore", safe => 0, |