Merge branch 'master' into cvs

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

diff --git a/.gitignore b/.gitignore
index b474b24c1399106fdbbd72ee031d4cb5e571b259..fe1c3d441cc362d12390c70d8e3c9266f1ac5021 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,21 @@
+ikiwiki.setup

 Makefile
 Makefile

-blib/
-doc/.ikiwiki/
-html/
+Makefile.old
+blib/*
+/cover_db
+doc/.ikiwiki/*
+html/*

 ikiwiki.out
 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/