Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8de36e2c8df25ab30f7fadeffbcdf25f189863f3..b54b830fdd7a3582705a3031b9806b1fd4488905 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,25 @@ ikiwiki.setup
 Makefile
 Makefile.old
 blib/*
 Makefile
 Makefile.old
 blib/*

+/cover_db

 doc/.ikiwiki/*
 html/*
 ikiwiki.out
 doc/.ikiwiki/*
 html/*
 ikiwiki.out

+ikiwiki-transition.out
+ikiwiki-calendar.out
+ikiwiki-comment.out

 pm_to_blib
 pm_to_blib

+/MYMETA.json
+/MYMETA.yml

 *.man
 *.man

-build-stamp
+/po/cover_db
+/po/html/

 po/po2wiki_stamp
 po/po2wiki_stamp

+/po/underlays/.ikiwiki

 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn
 po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
 po/underlays/basewiki/*/*/*.mdwn
 po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale

+/t/tmp/