Merge branch 'master' of git://git.ikiwiki.info into cvs

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

diff --git a/.gitignore b/.gitignore
index 7d521d4288fcac424706a7b4ccf5b464d235d441..da2f4eb463b83ba0bd24ade50e8513d00ee7a455 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,22 @@
+ikiwiki.setup

 Makefile
 Makefile

+Makefile.old

 blib/*
 blib/*

+/cover_db

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

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

 pm_to_blib
 pm_to_blib

+*.man
+/po/cover_db
+po/po2wiki_stamp
+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/
+doc/bugs/Pages_with_non-ascii_characters_like_*